home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 62.1 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 31 37 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:17 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 69 6e 69 74 2e 65 6c 0a |f/ediff-|init.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 69 6e 69 74 2e | 65 6c 27 20 77 61 73 20 |ff-init.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 09 | 42 11 c2 09 42 11 c3 09 |code "..|B...B...|
|00000270| 42 11 c4 09 42 11 c5 09 | 42 11 c6 09 42 11 c7 09 |B...B...|B...B...|
|00000280| 42 11 c8 09 42 11 c9 ca | 0e 0b 5c 22 16 0c cc 09 |B...B...|..\"....|
|00000290| 42 11 0e 0c 3f 16 0d cd | 09 42 11 c0 87 22 20 5b |B...?...|.B..." [|
|000002a0| 65 64 69 66 66 2d 6d 65 | 74 61 6a 6f 62 2d 6e 61 |ediff-me|tajob-na|
|000002b0| 6d 65 20 63 75 72 72 65 | 6e 74 2d 6c 6f 61 64 2d |me curre|nt-load-|
|000002c0| 6c 69 73 74 20 65 64 69 | 66 66 2d 6d 65 74 61 2d |list edi|ff-meta-|
|000002d0| 62 75 66 66 65 72 20 70 | 6d 2d 63 6f 6c 6f 72 2d |buffer p|m-color-|
|000002e0| 61 6c 69 73 74 20 65 64 | 69 66 66 2d 67 72 61 62 |alist ed|iff-grab|
|000002f0| 2d 6d 6f 75 73 65 20 65 | 64 69 66 66 2d 6d 6f 75 |-mouse e|diff-mou|
|00000300| 73 65 2d 70 69 78 65 6c | 2d 70 6f 73 69 74 69 6f |se-pixel|-positio|
|00000310| 6e 20 65 64 69 66 66 2d | 6d 6f 75 73 65 2d 70 69 |n ediff-|mouse-pi|
|00000320| 78 65 6c 2d 74 68 72 65 | 73 68 6f 6c 64 20 65 64 |xel-thre|shold ed|
|00000330| 69 66 66 2d 77 68 69 74 | 65 73 70 61 63 65 20 65 |iff-whit|espace e|
|00000340| 64 69 66 66 2d 6d 75 6c | 74 69 66 72 61 6d 65 20 |diff-mul|tiframe |
|00000350| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 22 58 45 |string-m|atch "XE|
|00000360| 6d 61 63 73 22 20 65 6d | 61 63 73 2d 76 65 72 73 |macs" em|acs-vers|
|00000370| 69 6f 6e 20 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |ion edif|f-xemacs|
|00000380| 2d 70 20 65 64 69 66 66 | 2d 65 6d 61 63 73 2d 70 |-p ediff|-emacs-p|
|00000390| 5d 20 33 29 0a 23 40 31 | 38 32 20 49 66 20 74 2c |] 3).#@1|82 If t,|
|000003a0| 20 45 64 69 66 66 20 77 | 69 6c 6c 20 74 68 69 6e | Ediff w|ill thin|
|000003b0| 6b 20 74 68 61 74 20 69 | 74 20 69 73 20 72 75 6e |k that i|t is run|
|000003c0| 6e 69 6e 67 20 6f 6e 20 | 61 20 64 69 73 70 6c 61 |ning on |a displa|
|000003d0| 79 20 74 68 61 74 20 73 | 75 70 70 6f 72 74 73 20 |y that s|upports |
|000003e0| 66 61 63 65 73 2e 0a 54 | 68 69 73 20 69 73 20 70 |faces..T|his is p|
|000003f0| 72 6f 76 69 64 65 64 20 | 61 73 20 61 20 74 65 6d |rovided |as a tem|
|00000400| 70 6f 72 61 72 79 20 72 | 65 6c 69 65 66 20 66 6f |porary r|elief fo|
|00000410| 72 20 75 73 65 72 73 20 | 6f 66 20 66 61 63 65 2d |r users |of face-|
|00000420| 63 61 70 61 62 6c 65 20 | 64 69 73 70 6c 61 79 73 |capable |displays|
|00000430| 0a 74 68 61 74 20 45 64 | 69 66 66 20 64 6f 65 73 |.that Ed|iff does|
|00000440| 6e 27 74 20 6b 6e 6f 77 | 20 61 62 6f 75 74 2e 1f |n't know| about..|
|00000450| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 66 |.(defvar| ediff-f|
|00000460| 6f 72 63 65 2d 66 61 63 | 65 73 20 6e 69 6c 20 28 |orce-fac|es nil (|
|00000470| 23 24 20 2e 20 39 32 33 | 29 29 0a 28 64 65 66 61 |#$ . 923|)).(defa|
|00000480| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 64 65 76 69 |lias 'ed|iff-devi|
|00000490| 63 65 2d 74 79 70 65 20 | 23 5b 6e 69 6c 20 22 08 |ce-type |#[nil ".|
|000004a0| ab 82 09 87 c2 c3 20 21 | 87 22 20 5b 65 64 69 66 |...... !|." [edif|
|000004b0| 66 2d 65 6d 61 63 73 2d | 70 20 77 69 6e 64 6f 77 |f-emacs-|p window|
|000004c0| 2d 73 79 73 74 65 6d 20 | 64 65 76 69 63 65 2d 74 |-system |device-t|
|000004d0| 79 70 65 20 73 65 6c 65 | 63 74 65 64 2d 64 65 76 |ype sele|cted-dev|
|000004e0| 69 63 65 5d 20 32 5d 29 | 0a 28 62 79 74 65 2d 63 |ice] 2])|.(byte-c|
|000004f0| 6f 64 65 20 22 c0 c1 4e | c2 73 ac 85 c3 c4 c0 5c |ode "..N|.s.....\|
|00000500| 22 88 c5 c0 c1 c6 23 87 | 22 20 5b 65 64 69 66 66 |".....#.|" [ediff|
|00000510| 2d 64 65 76 69 63 65 2d | 74 79 70 65 20 62 79 74 |-device-|type byt|
|00000520| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 20 28 6e 69 6c |e-optimi|zer (nil|
|00000530| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|00000540| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 20 65 72 72 |line-exp|and) err|
|00000550| 6f 72 20 22 25 73 20 61 | 6c 72 65 61 64 79 20 68 |or "%s a|lready h|
|00000560| 61 73 20 61 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |as a byt|e-optimi|
|00000570| 7a 65 72 2c 20 63 61 6e | 27 74 20 6d 61 6b 65 20 |zer, can|'t make |
|00000580| 69 74 20 69 6e 6c 69 6e | 65 22 20 70 75 74 20 62 |it inlin|e" put b|
|00000590| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|000005a0| 6e 65 2d 65 78 70 61 6e | 64 5d 20 34 29 0a 28 64 |ne-expan|d] 4).(d|
|000005b0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 77 |efalias |'ediff-w|
|000005c0| 69 6e 64 6f 77 2d 64 69 | 73 70 6c 61 79 2d 70 20 |indow-di|splay-p |
|000005d0| 23 5b 6e 69 6c 20 22 08 | ab 83 09 aa 84 c2 c3 20 |#[nil ".|....... |
|000005e0| 21 ad 8d 08 ab 83 09 aa | 84 c2 c3 20 21 c4 73 3f |!.......|... !.s?|
|000005f0| 87 22 20 5b 65 64 69 66 | 66 2d 65 6d 61 63 73 2d |." [edif|f-emacs-|
|00000600| 70 20 77 69 6e 64 6f 77 | 2d 73 79 73 74 65 6d 20 |p window|-system |
|00000610| 64 65 76 69 63 65 2d 74 | 79 70 65 20 73 65 6c 65 |device-t|ype sele|
|00000620| 63 74 65 64 2d 64 65 76 | 69 63 65 20 28 74 74 79 |cted-dev|ice (tty|
|00000630| 20 70 63 20 73 74 72 65 | 61 6d 29 5d 20 32 5d 29 | pc stre|am)] 2])|
|00000640| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00000650| 66 2d 68 61 73 2d 66 61 | 63 65 2d 73 75 70 70 6f |f-has-fa|ce-suppo|
|00000660| 72 74 2d 70 20 23 5b 6e | 69 6c 20 22 c0 20 ae a3 |rt-p #[n|il ". ..|
|00000670| 09 ae a0 5c 6e ab 8d 5c | 6e ab 83 0b aa 84 c4 c5 |...\n..\|n.......|
|00000680| 20 21 c6 73 87 0e 07 ad | 8c 5c 6e ab 83 0b aa 84 | !.s....|.\n.....|
|00000690| c4 c5 20 21 c8 73 87 22 | 20 5b 65 64 69 66 66 2d |.. !.s."| [ediff-|
|000006a0| 77 69 6e 64 6f 77 2d 64 | 69 73 70 6c 61 79 2d 70 |window-d|isplay-p|
|000006b0| 20 65 64 69 66 66 2d 66 | 6f 72 63 65 2d 66 61 63 | ediff-f|orce-fac|
|000006c0| 65 73 20 65 64 69 66 66 | 2d 65 6d 61 63 73 2d 70 |es ediff|-emacs-p|
|000006d0| 20 77 69 6e 64 6f 77 2d | 73 79 73 74 65 6d 20 64 | window-|system d|
|000006e0| 65 76 69 63 65 2d 74 79 | 70 65 20 73 65 6c 65 63 |evice-ty|pe selec|
|000006f0| 74 65 64 2d 64 65 76 69 | 63 65 20 28 70 63 29 20 |ted-devi|ce (pc) |
|00000700| 65 64 69 66 66 2d 78 65 | 6d 61 63 73 2d 70 20 28 |ediff-xe|macs-p (|
|00000710| 74 74 79 20 70 63 29 5d | 20 32 5d 29 0a 28 64 65 |tty pc)]| 2]).(de|
|00000720| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 64 65 |falias '|ediff-de|
|00000730| 66 76 61 72 2d 6c 6f 63 | 61 6c 20 27 28 6d 61 63 |fvar-loc|al '(mac|
|00000740| 72 6f 20 2e 20 23 5b 28 | 76 61 72 20 76 61 6c 75 |ro . #[(|var valu|
|00000750| 65 20 64 6f 63 29 20 22 | c0 c1 5c 6e 0b 0c 46 c5 |e doc) "|..\n..F.|
|00000760| c6 5c 6e 44 44 c7 c6 5c | 6e 44 c8 42 42 46 87 22 |.\nDD..\|nD.BBF."|
|00000770| 20 5b 70 72 6f 67 6e 20 | 64 65 66 76 61 72 20 76 | [progn |defvar v|
|00000780| 61 72 20 76 61 6c 75 65 | 20 64 6f 63 20 6d 61 6b |ar value| doc mak|
|00000790| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000007a0| 72 2d 6c 6f 63 61 6c 20 | 71 75 6f 74 65 20 70 75 |r-local |quote pu|
|000007b0| 74 20 28 27 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |t ('perm|anent-lo|
|000007c0| 63 61 6c 20 74 29 5d 20 | 36 5d 29 29 0a 23 40 32 |cal t)] |6])).#@2|
|000007d0| 20 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 | ..(defv|ar ediff|
|000007e0| 2d 62 75 66 66 65 72 2d | 41 20 6e 69 6c 20 28 23 |-buffer-|A nil (#|
|000007f0| 24 20 2e 20 32 30 30 31 | 29 29 0a 28 62 79 74 65 |$ . 2001|)).(byte|
|00000800| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000810| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000820| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000830| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 41 20 70 75 |diff-buf|fer-A pu|
|00000840| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00000850| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00000860| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 75 66 66 |efvar ed|iff-buff|
|00000870| 65 72 2d 42 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |er-B nil| (#$ . 2|
|00000880| 31 34 30 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |140)).(b|yte-code|
|00000890| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|000008a0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000008b0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000008c0| 62 75 66 66 65 72 2d 42 | 20 70 75 74 20 70 65 72 |buffer-B| put per|
|000008d0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|000008e0| 34 29 0a 23 40 32 20 1f | 0a 28 64 65 66 76 61 72 |4).#@2 .|.(defvar|
|000008f0| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 43 20 | ediff-b|uffer-C |
|00000900| 6e 69 6c 20 28 23 24 20 | 2e 20 32 32 37 39 29 29 |nil (#$ |. 2279))|
|00000910| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000920| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00000930| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000940| 6f 63 61 6c 20 65 64 69 | 66 66 2d 62 75 66 66 65 |ocal edi|ff-buffe|
|00000950| 72 2d 43 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |r-C put |permanen|
|00000960| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00000970| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00000980| 66 2d 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 66 65 |f-ancest|or-buffe|
|00000990| 72 20 6e 69 6c 20 28 23 | 24 20 2e 20 32 34 31 38 |r nil (#|$ . 2418|
|000009a0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|000009b0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000009c0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000009d0| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 61 6e 63 |-local e|diff-anc|
|000009e0| 65 73 74 6f 72 2d 62 75 | 66 66 65 72 20 70 75 74 |estor-bu|ffer put|
|000009f0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00000a00| 20 74 5d 20 34 29 0a 23 | 40 32 20 1f 0a 28 64 65 | t] 4).#|@2 ..(de|
|00000a10| 66 76 61 72 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |fvar edi|ff-contr|
|00000a20| 6f 6c 2d 62 75 66 66 65 | 72 20 6e 69 6c 20 28 23 |ol-buffe|r nil (#|
|00000a30| 24 20 2e 20 32 35 37 31 | 29 29 0a 28 62 79 74 65 |$ . 2571|)).(byte|
|00000a40| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000a50| 88 c5 16 06 c6 0e 07 42 | 16 07 c0 87 22 20 5b 6d |.......B|...." [m|
|00000a60| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000a70| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00000a80| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 70 |control-|buffer p|
|00000a90| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00000aa0| 61 6c 20 74 20 28 28 3f | 41 20 2e 20 65 64 69 66 |al t ((?|A . edif|
|00000ab0| 66 2d 62 75 66 66 65 72 | 2d 41 29 20 28 3f 42 20 |f-buffer|-A) (?B |
|00000ac0| 2e 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 42 |. ediff-|buffer-B|
|00000ad0| 29 20 28 3f 43 20 2e 20 | 65 64 69 66 66 2d 62 75 |) (?C . |ediff-bu|
|00000ae0| 66 66 65 72 2d 43 29 29 | 20 65 64 69 66 66 2d 62 |ffer-C))| ediff-b|
|00000af0| 75 66 66 65 72 2d 61 6c | 69 73 74 20 63 75 72 72 |uffer-al|ist curr|
|00000b00| 65 6e 74 2d 6c 6f 61 64 | 2d 6c 69 73 74 5d 20 34 |ent-load|-list] 4|
|00000b10| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00000b20| 66 66 2d 6f 64 64 2d 70 | 20 27 28 6d 61 63 72 6f |ff-odd-p| '(macro|
|00000b30| 20 2e 20 23 5b 28 61 72 | 67 29 20 22 c0 c1 5c 6e | . #[(ar|g) "..\n|
|00000b40| c3 42 42 c4 42 42 87 22 | 20 5b 65 71 20 6c 6f 67 |.BB.BB."| [eq log|
|00000b50| 61 6e 64 20 61 72 67 20 | 28 31 29 20 28 31 29 5d |and arg |(1) (1)]|
|00000b60| 20 34 5d 29 29 0a 28 64 | 65 66 61 6c 69 61 73 20 | 4])).(d|efalias |
|00000b70| 27 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 6c 69 |'ediff-b|uffer-li|
|00000b80| 76 65 2d 70 20 27 28 6d | 61 63 72 6f 20 2e 20 23 |ve-p '(m|acro . #|
|00000b90| 5b 28 62 75 66 29 20 22 | c0 09 c2 09 44 c3 c2 09 |[(buf) "|....D...|
|00000ba0| 44 44 46 87 22 20 5b 61 | 6e 64 20 62 75 66 20 67 |DDF." [a|nd buf g|
|00000bb0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00000bc0| 2d 6e 61 6d 65 5d 20 36 | 5d 29 29 0a 28 64 65 66 |-name] 6|])).(def|
|00000bd0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 67 65 74 |alias 'e|diff-get|
|00000be0| 2d 62 75 66 66 65 72 20 | 27 28 6d 61 63 72 6f 20 |-buffer |'(macro |
|00000bf0| 2e 20 23 5b 28 61 72 67 | 29 20 22 c0 c1 5c 6e c3 |. #[(arg|) "..\n.|
|00000c00| 42 42 c4 42 c1 5c 6e c5 | 42 42 c6 42 c1 5c 6e c7 |BB.B.\n.|BB.B.\n.|
|00000c10| 42 42 c8 42 c1 5c 6e c9 | 42 42 ca 42 af 05 87 22 |BB.B.\n.|BB.B..."|
|00000c20| 20 5b 63 6f 6e 64 20 65 | 71 20 61 72 67 20 28 27 | [cond e|q arg ('|
|00000c30| 41 29 20 28 65 64 69 66 | 66 2d 62 75 66 66 65 72 |A) (edif|f-buffer|
|00000c40| 2d 41 29 20 28 27 42 29 | 20 28 65 64 69 66 66 2d |-A) ('B)| (ediff-|
|00000c50| 62 75 66 66 65 72 2d 42 | 29 20 28 27 43 29 20 28 |buffer-B|) ('C) (|
|00000c60| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 43 29 20 |ediff-bu|ffer-C) |
|00000c70| 28 27 41 6e 63 65 73 74 | 6f 72 29 20 28 65 64 69 |('Ancest|or) (edi|
|00000c80| 66 66 2d 61 6e 63 65 73 | 74 6f 72 2d 62 75 66 66 |ff-ances|tor-buff|
|00000c90| 65 72 29 5d 20 37 5d 29 | 29 0a 28 64 65 66 61 6c |er)] 7])|).(defal|
|00000ca0| 69 61 73 20 27 65 64 69 | 66 66 2d 67 65 74 2d 76 |ias 'edi|ff-get-v|
|00000cb0| 61 6c 75 65 2d 61 63 63 | 6f 72 64 69 6e 67 2d 74 |alue-acc|ording-t|
|00000cc0| 6f 2d 62 75 66 66 65 72 | 2d 74 79 70 65 20 27 28 |o-buffer|-type '(|
|00000cd0| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 62 75 66 2d 74 |macro . |#[(buf-t|
|00000ce0| 79 70 65 20 6c 69 73 74 | 29 20 22 c0 c1 5c 6e c3 |ype list|) "..\n.|
|00000cf0| 42 42 c4 c5 0e 06 45 44 | c1 5c 6e c7 42 42 c4 c8 |BB....ED|.\n.BB..|
|00000d00| 0e 06 45 44 c1 5c 6e c9 | 42 42 c4 ca 0e 06 45 44 |..ED.\n.|BB....ED|
|00000d10| 46 87 22 20 5b 63 6f 6e | 64 20 65 71 20 62 75 66 |F." [con|d eq buf|
|00000d20| 2d 74 79 70 65 20 28 27 | 41 29 20 6e 74 68 20 30 |-type ('|A) nth 0|
|00000d30| 20 6c 69 73 74 20 28 27 | 42 29 20 31 20 28 27 43 | list ('|B) 1 ('C|
|00000d40| 29 20 32 5d 20 37 5d 29 | 29 0a 28 64 65 66 61 6c |) 2] 7])|).(defal|
|00000d50| 69 61 73 20 27 65 64 69 | 66 66 2d 63 68 61 72 2d |ias 'edi|ff-char-|
|00000d60| 74 6f 2d 62 75 66 74 79 | 70 65 20 27 28 6d 61 63 |to-bufty|pe '(mac|
|00000d70| 72 6f 20 2e 20 23 5b 28 | 61 72 67 29 20 22 c0 c1 |ro . #[(|arg) "..|
|00000d80| 5c 6e c3 42 42 c4 42 c1 | 5c 6e c5 42 42 c6 42 c1 |\n.BB.B.|\n.BB.B.|
|00000d90| 5c 6e c7 42 42 c8 42 46 | 87 22 20 5b 63 6f 6e 64 |\n.BB.BF|." [cond|
|00000da0| 20 6d 65 6d 71 20 61 72 | 67 20 28 27 28 3f 61 20 | memq ar|g ('(?a |
|00000db0| 3f 41 29 29 20 28 27 41 | 29 20 28 27 28 3f 62 20 |?A)) ('A|) ('(?b |
|00000dc0| 3f 42 29 29 20 28 27 42 | 29 20 28 27 28 3f 63 20 |?B)) ('B|) ('(?c |
|00000dd0| 3f 43 29 29 20 28 27 43 | 29 5d 20 36 5d 29 29 0a |?C)) ('C|)] 6])).|
|00000de0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00000df0| 2d 67 65 74 2d 73 79 6d | 62 6f 6c 2d 66 72 6f 6d |-get-sym|bol-from|
|00000e00| 2d 61 6c 69 73 74 20 23 | 5b 28 62 75 66 2d 74 79 |-alist #|[(buf-ty|
|00000e10| 70 65 20 61 6c 69 73 74 | 29 20 22 c0 09 5c 6e 5c |pe alist|) "..\n\|
|00000e20| 22 41 87 22 20 5b 61 73 | 73 6f 63 20 62 75 66 2d |"A." [as|soc buf-|
|00000e30| 74 79 70 65 20 61 6c 69 | 73 74 5d 20 33 5d 29 0a |type ali|st] 3]).|
|00000e40| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 4e c2 |(byte-co|de "..N.|
|00000e50| 73 ac 85 c3 c4 c0 5c 22 | 88 c5 c0 c1 c6 23 88 c7 |s.....\"|.....#..|
|00000e60| 16 08 c8 0e 09 42 16 09 | c0 87 22 20 5b 65 64 69 |.....B..|.." [edi|
|00000e70| 66 66 2d 67 65 74 2d 73 | 79 6d 62 6f 6c 2d 66 72 |ff-get-s|ymbol-fr|
|00000e80| 6f 6d 2d 61 6c 69 73 74 | 20 62 79 74 65 2d 6f 70 |om-alist| byte-op|
|00000e90| 74 69 6d 69 7a 65 72 20 | 28 6e 69 6c 20 62 79 74 |timizer |(nil byt|
|00000ea0| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|00000eb0| 2d 65 78 70 61 6e 64 29 | 20 65 72 72 6f 72 20 22 |-expand)| error "|
|00000ec0| 25 73 20 61 6c 72 65 61 | 64 79 20 68 61 73 20 61 |%s alrea|dy has a|
|00000ed0| 20 62 79 74 65 2d 6f 70 | 74 69 6d 69 7a 65 72 2c | byte-op|timizer,|
|00000ee0| 20 63 61 6e 27 74 20 6d | 61 6b 65 20 69 74 20 69 | can't m|ake it i|
|00000ef0| 6e 6c 69 6e 65 22 20 70 | 75 74 20 62 79 74 65 2d |nline" p|ut byte-|
|00000f00| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00000f10| 78 70 61 6e 64 20 28 28 | 41 20 2e 20 65 64 69 66 |xpand ((|A . edif|
|00000f20| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 76 65 63 |f-differ|ence-vec|
|00000f30| 74 6f 72 2d 41 29 20 28 | 42 20 2e 20 65 64 69 66 |tor-A) (|B . edif|
|00000f40| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 76 65 63 |f-differ|ence-vec|
|00000f50| 74 6f 72 2d 42 29 20 28 | 43 20 2e 20 65 64 69 66 |tor-B) (|C . edif|
|00000f60| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 76 65 63 |f-differ|ence-vec|
|00000f70| 74 6f 72 2d 43 29 20 28 | 41 6e 63 65 73 74 6f 72 |tor-C) (|Ancestor|
|00000f80| 20 2e 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 | . ediff|-differe|
|00000f90| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 41 6e 63 65 73 |nce-vect|or-Ances|
|00000fa0| 74 6f 72 29 29 20 65 64 | 69 66 66 2d 64 69 66 66 |tor)) ed|iff-diff|
|00000fb0| 65 72 65 6e 63 65 2d 76 | 65 63 74 6f 72 2d 61 6c |erence-v|ector-al|
|00000fc0| 69 73 74 20 63 75 72 72 | 65 6e 74 2d 6c 6f 61 64 |ist curr|ent-load|
|00000fd0| 2d 6c 69 73 74 5d 20 34 | 29 0a 28 64 65 66 61 6c |-list] 4|).(defal|
|00000fe0| 69 61 73 20 27 65 64 69 | 66 66 2d 67 65 74 2d 64 |ias 'edi|ff-get-d|
|00000ff0| 69 66 66 65 72 65 6e 63 | 65 20 27 28 6d 61 63 72 |ifferenc|e '(macr|
|00001000| 6f 20 2e 20 23 5b 28 6e | 20 62 75 66 2d 74 79 70 |o . #[(n| buf-typ|
|00001010| 65 29 20 22 c0 c1 c2 0b | c4 42 42 44 0d 45 87 22 |e) "....|.BBD.E."|
|00001020| 20 5b 61 72 65 66 20 73 | 79 6d 62 6f 6c 2d 76 61 | [aref s|ymbol-va|
|00001030| 6c 75 65 20 65 64 69 66 | 66 2d 67 65 74 2d 73 79 |lue edif|f-get-sy|
|00001040| 6d 62 6f 6c 2d 66 72 6f | 6d 2d 61 6c 69 73 74 20 |mbol-fro|m-alist |
|00001050| 62 75 66 2d 74 79 70 65 | 20 28 65 64 69 66 66 2d |buf-type| (ediff-|
|00001060| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00001070| 72 2d 61 6c 69 73 74 29 | 20 6e 5d 20 35 5d 29 29 |r-alist)| n] 5]))|
|00001080| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001090| 66 2d 6e 6f 2d 66 69 6e | 65 2d 64 69 66 66 73 2d |f-no-fin|e-diffs-|
|000010a0| 70 20 27 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 6e |p '(macr|o . #[(n|
|000010b0| 29 20 22 c0 c1 5c 6e c3 | 42 42 c4 42 42 87 22 20 |) "..\n.|BB.BB." |
|000010c0| 5b 61 72 65 66 20 65 64 | 69 66 66 2d 67 65 74 2d |[aref ed|iff-get-|
|000010d0| 64 69 66 66 65 72 65 6e | 63 65 20 6e 20 28 27 41 |differen|ce n ('A|
|000010e0| 29 20 28 32 29 5d 20 34 | 5d 29 29 0a 28 64 65 66 |) (2)] 4|])).(def|
|000010f0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 67 65 74 |alias 'e|diff-get|
|00001100| 2d 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 2d 66 72 |-diff-ov|erlay-fr|
|00001110| 6f 6d 2d 64 69 66 66 2d | 72 65 63 6f 72 64 20 27 |om-diff-|record '|
|00001120| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 64 69 66 66 |(macro .| #[(diff|
|00001130| 2d 72 65 63 29 20 22 c0 | 09 c2 42 42 87 22 20 5b |-rec) ".|..BB." [|
|00001140| 61 72 65 66 20 64 69 66 | 66 2d 72 65 63 20 28 30 |aref dif|f-rec (0|
|00001150| 29 5d 20 33 5d 29 29 0a | 28 64 65 66 61 6c 69 61 |)] 3])).|(defalia|
|00001160| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 64 69 66 |s 'ediff|-get-dif|
|00001170| 66 2d 6f 76 65 72 6c 61 | 79 20 27 28 6d 61 63 72 |f-overla|y '(macr|
|00001180| 6f 20 2e 20 23 5b 28 6e | 20 62 75 66 2d 74 79 70 |o . #[(n| buf-typ|
|00001190| 65 29 20 22 c0 c1 5c 6e | 0b 45 44 87 22 20 5b 65 |e) "..\n|.ED." [e|
|000011a0| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 2d 6f 76 |diff-get|-diff-ov|
|000011b0| 65 72 6c 61 79 2d 66 72 | 6f 6d 2d 64 69 66 66 2d |erlay-fr|om-diff-|
|000011c0| 72 65 63 6f 72 64 20 65 | 64 69 66 66 2d 67 65 74 |record e|diff-get|
|000011d0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 6e 20 62 75 |-differe|nce n bu|
|000011e0| 66 2d 74 79 70 65 5d 20 | 34 5d 29 29 0a 28 64 65 |f-type] |4])).(de|
|000011f0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 67 65 |falias '|ediff-ge|
|00001200| 74 2d 66 69 6e 65 2d 64 | 69 66 66 2d 76 65 63 74 |t-fine-d|iff-vect|
|00001210| 6f 72 2d 66 72 6f 6d 2d | 64 69 66 66 2d 72 65 63 |or-from-|diff-rec|
|00001220| 6f 72 64 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |ord '(ma|cro . #[|
|00001230| 28 64 69 66 66 2d 72 65 | 63 29 20 22 c0 09 c2 42 |(diff-re|c) "...B|
|00001240| 42 87 22 20 5b 61 72 65 | 66 20 64 69 66 66 2d 72 |B." [are|f diff-r|
|00001250| 65 63 20 28 31 29 5d 20 | 33 5d 29 29 0a 28 64 65 |ec (1)] |3])).(de|
|00001260| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 73 65 |falias '|ediff-se|
|00001270| 74 2d 66 69 6e 65 2d 64 | 69 66 66 2d 76 65 63 74 |t-fine-d|iff-vect|
|00001280| 6f 72 20 27 28 6d 61 63 | 72 6f 20 2e 20 23 5b 28 |or '(mac|ro . #[(|
|00001290| 6e 20 62 75 66 2d 74 79 | 70 65 20 66 69 6e 65 2d |n buf-ty|pe fine-|
|000012a0| 76 65 63 29 20 22 c0 c1 | 5c 6e 0b 45 c4 0d 46 87 |vec) "..|\n.E..F.|
|000012b0| 22 20 5b 61 73 65 74 20 | 65 64 69 66 66 2d 67 65 |" [aset |ediff-ge|
|000012c0| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 6e 20 62 |t-differ|ence n b|
|000012d0| 75 66 2d 74 79 70 65 20 | 31 20 66 69 6e 65 2d 76 |uf-type |1 fine-v|
|000012e0| 65 63 5d 20 34 5d 29 29 | 0a 28 64 65 66 61 6c 69 |ec] 4]))|.(defali|
|000012f0| 61 73 20 27 65 64 69 66 | 66 2d 67 65 74 2d 73 74 |as 'edif|f-get-st|
|00001300| 61 74 65 2d 6f 66 2d 64 | 69 66 66 20 27 28 6d 61 |ate-of-d|iff '(ma|
|00001310| 63 72 6f 20 2e 20 23 5b | 28 6e 20 62 75 66 2d 74 |cro . #[|(n buf-t|
|00001320| 79 70 65 29 20 22 c0 c1 | c2 c3 0c 0d 45 c6 42 42 |ype) "..|....E.BB|
|00001330| 45 87 22 20 5b 69 66 20 | 28 65 64 69 66 66 2d 62 |E." [if |(ediff-b|
|00001340| 75 66 66 65 72 2d 6c 69 | 76 65 2d 70 20 65 64 69 |uffer-li|ve-p edi|
|00001350| 66 66 2d 62 75 66 66 65 | 72 2d 43 29 20 61 72 65 |ff-buffe|r-C) are|
|00001360| 66 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |f ediff-|get-diff|
|00001370| 65 72 65 6e 63 65 20 6e | 20 62 75 66 2d 74 79 70 |erence n| buf-typ|
|00001380| 65 20 28 33 29 5d 20 36 | 5d 29 29 0a 28 64 65 66 |e (3)] 6|])).(def|
|00001390| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 73 65 74 |alias 'e|diff-set|
|000013a0| 2d 73 74 61 74 65 2d 6f | 66 2d 64 69 66 66 20 27 |-state-o|f-diff '|
|000013b0| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 6e 20 62 75 |(macro .| #[(n bu|
|000013c0| 66 2d 74 79 70 65 20 76 | 61 6c 29 20 22 c0 c1 5c |f-type v|al) "..\|
|000013d0| 6e 0b 45 c4 0d 46 87 22 | 20 5b 61 73 65 74 20 65 |n.E..F."| [aset e|
|000013e0| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 65 72 65 |diff-get|-differe|
|000013f0| 6e 63 65 20 6e 20 62 75 | 66 2d 74 79 70 65 20 33 |nce n bu|f-type 3|
|00001400| 20 76 61 6c 5d 20 34 5d | 29 29 0a 28 64 65 66 61 | val] 4]|)).(defa|
|00001410| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 67 65 74 2d |lias 'ed|iff-get-|
|00001420| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 27 |state-of|-merge '|
|00001430| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 6e 29 20 22 |(macro .| #[(n) "|
|00001440| c0 c1 c2 89 c1 0b 45 c4 | 42 42 45 87 22 20 5b 69 |......E.|BBE." [i|
|00001450| 66 20 65 64 69 66 66 2d | 73 74 61 74 65 2d 6f 66 |f ediff-|state-of|
|00001460| 2d 6d 65 72 67 65 20 61 | 72 65 66 20 6e 20 28 30 |-merge a|ref n (0|
|00001470| 29 5d 20 36 5d 29 29 0a | 28 64 65 66 61 6c 69 61 |)] 6])).|(defalia|
|00001480| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 73 74 61 |s 'ediff|-get-sta|
|00001490| 74 65 2d 6f 66 2d 61 6e | 63 65 73 74 6f 72 20 27 |te-of-an|cestor '|
|000014a0| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 6e 29 20 22 |(macro .| #[(n) "|
|000014b0| c0 c1 c2 89 c1 0b 45 c4 | 42 42 45 87 22 20 5b 69 |......E.|BBE." [i|
|000014c0| 66 20 65 64 69 66 66 2d | 73 74 61 74 65 2d 6f 66 |f ediff-|state-of|
|000014d0| 2d 6d 65 72 67 65 20 61 | 72 65 66 20 6e 20 28 31 |-merge a|ref n (1|
|000014e0| 29 5d 20 36 5d 29 29 0a | 28 64 65 66 61 6c 69 61 |)] 6])).|(defalia|
|000014f0| 73 20 27 65 64 69 66 66 | 2d 73 65 74 2d 73 74 61 |s 'ediff|-set-sta|
|00001500| 74 65 2d 6f 66 2d 6d 65 | 72 67 65 20 27 28 6d 61 |te-of-me|rge '(ma|
|00001510| 63 72 6f 20 2e 20 23 5b | 28 6e 20 76 61 6c 29 20 |cro . #[|(n val) |
|00001520| 22 c0 c1 c2 c3 c1 0c 45 | c5 0e 06 46 45 87 22 20 |"......E|...FE." |
|00001530| 5b 69 66 20 65 64 69 66 | 66 2d 73 74 61 74 65 2d |[if edif|f-state-|
|00001540| 6f 66 2d 6d 65 72 67 65 | 20 61 73 65 74 20 61 72 |of-merge| aset ar|
|00001550| 65 66 20 6e 20 30 20 76 | 61 6c 5d 20 36 5d 29 29 |ef n 0 v|al] 6]))|
|00001560| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001570| 66 2d 6d 61 72 6b 2d 64 | 69 66 66 2d 61 73 2d 73 |f-mark-d|iff-as-s|
|00001580| 70 61 63 65 2d 6f 6e 6c | 79 20 27 28 6d 61 63 72 |pace-onl|y '(macr|
|00001590| 6f 20 2e 20 23 5b 28 6e | 20 66 6c 61 67 29 20 22 |o . #[(n| flag) "|
|000015a0| c0 c1 5c 6e c3 42 42 c4 | 0d 46 87 22 20 5b 61 73 |..\n.BB.|.F." [as|
|000015b0| 65 74 20 65 64 69 66 66 | 2d 67 65 74 2d 64 69 66 |et ediff|-get-dif|
|000015c0| 66 65 72 65 6e 63 65 20 | 6e 20 28 27 41 29 20 32 |ference |n ('A) 2|
|000015d0| 20 66 6c 61 67 5d 20 34 | 5d 29 29 0a 28 64 65 66 | flag] 4|])).(def|
|000015e0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 67 65 74 |alias 'e|diff-get|
|000015f0| 2d 66 69 6e 65 2d 64 69 | 66 66 2d 76 65 63 74 6f |-fine-di|ff-vecto|
|00001600| 72 20 27 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 6e |r '(macr|o . #[(n|
|00001610| 20 62 75 66 2d 74 79 70 | 65 29 20 22 c0 c1 5c 6e | buf-typ|e) "..\n|
|00001620| 0b 45 44 87 22 20 5b 65 | 64 69 66 66 2d 67 65 74 |.ED." [e|diff-get|
|00001630| 2d 66 69 6e 65 2d 64 69 | 66 66 2d 76 65 63 74 6f |-fine-di|ff-vecto|
|00001640| 72 2d 66 72 6f 6d 2d 64 | 69 66 66 2d 72 65 63 6f |r-from-d|iff-reco|
|00001650| 72 64 20 65 64 69 66 66 | 2d 67 65 74 2d 64 69 66 |rd ediff|-get-dif|
|00001660| 66 65 72 65 6e 63 65 20 | 6e 20 62 75 66 2d 74 79 |ference |n buf-ty|
|00001670| 70 65 5d 20 34 5d 29 29 | 0a 28 64 65 66 61 6c 69 |pe] 4]))|.(defali|
|00001680| 61 73 20 27 65 64 69 66 | 66 2d 77 69 74 68 2d 63 |as 'edif|f-with-c|
|00001690| 75 72 72 65 6e 74 2d 62 | 75 66 66 65 72 20 27 28 |urrent-b|uffer '(|
|000016a0| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 62 75 66 66 65 |macro . |#[(buffe|
|000016b0| 72 20 26 72 65 73 74 20 | 62 6f 64 79 29 20 22 c0 |r &rest |body) ".|
|000016c0| c1 5c 6e 44 c3 c4 5c 6e | 44 0d 42 42 c6 42 42 42 |.\nD..\n|D.BB.BBB|
|000016d0| 87 22 20 5b 69 66 20 65 | 64 69 66 66 2d 62 75 66 |." [if e|diff-buf|
|000016e0| 66 65 72 2d 6c 69 76 65 | 2d 70 20 62 75 66 66 65 |fer-live|-p buffe|
|000016f0| 72 20 73 61 76 65 2d 63 | 75 72 72 65 6e 74 2d 62 |r save-c|urrent-b|
|00001700| 75 66 66 65 72 20 73 65 | 74 2d 62 75 66 66 65 72 |uffer se|t-buffer|
|00001710| 20 62 6f 64 79 20 28 28 | 6f 72 20 28 65 71 20 74 | body ((|or (eq t|
|00001720| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 27 65 64 69 |his-comm|and 'edi|
|00001730| 66 66 2d 71 75 69 74 29 | 20 28 65 72 72 6f 72 20 |ff-quit)| (error |
|00001740| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00001750| 41 4c 2d 42 55 46 46 45 | 52 29 29 29 5d 20 35 5d |AL-BUFFE|R)))] 5]|
|00001760| 29 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |)).(defa|lias 'ed|
|00001770| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 2d 73 |iff-mult|iframe-s|
|00001780| 65 74 75 70 2d 70 20 23 | 5b 6e 69 6c 20 22 c0 20 |etup-p #|[nil ". |
|00001790| ad 81 09 87 22 20 5b 65 | 64 69 66 66 2d 77 69 6e |...." [e|diff-win|
|000017a0| 64 6f 77 2d 64 69 73 70 | 6c 61 79 2d 70 20 65 64 |dow-disp|lay-p ed|
|000017b0| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 5d 20 |iff-mult|iframe] |
|000017c0| 31 5d 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |1]).(byt|e-code "|
|000017d0| c0 c1 4e c2 73 ac 85 c3 | c4 c0 5c 22 88 c5 c0 c1 |..N.s...|..\"....|
|000017e0| c6 23 87 22 20 5b 65 64 | 69 66 66 2d 6d 75 6c 74 |.#." [ed|iff-mult|
|000017f0| 69 66 72 61 6d 65 2d 73 | 65 74 75 70 2d 70 20 62 |iframe-s|etup-p b|
|00001800| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 20 28 6e |yte-opti|mizer (n|
|00001810| 69 6c 20 62 79 74 65 2d | 63 6f 6d 70 69 6c 65 2d |il byte-|compile-|
|00001820| 69 6e 6c 69 6e 65 2d 65 | 78 70 61 6e 64 29 20 65 |inline-e|xpand) e|
|00001830| 72 72 6f 72 20 22 25 73 | 20 61 6c 72 65 61 64 79 |rror "%s| already|
|00001840| 20 68 61 73 20 61 20 62 | 79 74 65 2d 6f 70 74 69 | has a b|yte-opti|
|00001850| 6d 69 7a 65 72 2c 20 63 | 61 6e 27 74 20 6d 61 6b |mizer, c|an't mak|
|00001860| 65 20 69 74 20 69 6e 6c | 69 6e 65 22 20 70 75 74 |e it inl|ine" put|
|00001870| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|00001880| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 5d 20 34 29 0a |line-exp|and] 4).|
|00001890| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000018a0| 2d 6e 61 72 72 6f 77 2d | 63 6f 6e 74 72 6f 6c 2d |-narrow-|control-|
|000018b0| 66 72 61 6d 65 2d 70 20 | 27 28 6d 61 63 72 6f 20 |frame-p |'(macro |
|000018c0| 2e 20 23 5b 6e 69 6c 20 | 22 c0 87 22 20 5b 28 61 |. #[nil |".." [(a|
|000018d0| 6e 64 20 28 65 64 69 66 | 66 2d 6d 75 6c 74 69 66 |nd (edif|f-multif|
|000018e0| 72 61 6d 65 2d 73 65 74 | 75 70 2d 70 29 20 28 65 |rame-set|up-p) (e|
|000018f0| 71 75 61 6c 20 65 64 69 | 66 66 2d 68 65 6c 70 2d |qual edi|ff-help-|
|00001900| 6d 65 73 73 61 67 65 20 | 65 64 69 66 66 2d 62 72 |message |ediff-br|
|00001910| 69 65 66 2d 6d 65 73 73 | 61 67 65 2d 73 74 72 69 |ief-mess|age-stri|
|00001920| 6e 67 29 29 5d 20 31 5d | 29 29 0a 28 64 65 66 61 |ng))] 1]|)).(defa|
|00001930| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 33 77 61 79 |lias 'ed|iff-3way|
|00001940| 2d 63 6f 6d 70 61 72 69 | 73 6f 6e 2d 6a 6f 62 20 |-compari|son-job |
|00001950| 27 28 6d 61 63 72 6f 20 | 2e 20 23 5b 6e 69 6c 20 |'(macro |. #[nil |
|00001960| 22 c0 87 22 20 5b 28 6d | 65 6d 71 20 65 64 69 66 |".." [(m|emq edif|
|00001970| 66 2d 6a 6f 62 2d 6e 61 | 6d 65 20 27 28 65 64 69 |f-job-na|me '(edi|
|00001980| 66 66 2d 66 69 6c 65 73 | 33 20 65 64 69 66 66 2d |ff-files|3 ediff-|
|00001990| 62 75 66 66 65 72 73 33 | 29 29 5d 20 31 5d 29 29 |buffers3|))] 1]))|
|000019a0| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|000019b0| 64 69 66 66 2d 33 77 61 | 79 2d 63 6f 6d 70 61 72 |diff-3wa|y-compar|
|000019c0| 69 73 6f 6e 2d 6a 6f 62 | 20 6e 69 6c 20 28 23 24 |ison-job| nil (#$|
|000019d0| 20 2e 20 36 35 36 35 29 | 29 0a 28 62 79 74 65 2d | . 6565)|).(byte-|
|000019e0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|000019f0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00001a00| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00001a10| 69 66 66 2d 33 77 61 79 | 2d 63 6f 6d 70 61 72 69 |iff-3way|-compari|
|00001a20| 73 6f 6e 2d 6a 6f 62 20 | 70 75 74 20 70 65 72 6d |son-job |put perm|
|00001a30| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00001a40| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00001a50| 66 66 2d 6d 65 72 67 65 | 2d 6a 6f 62 20 27 28 6d |ff-merge|-job '(m|
|00001a60| 61 63 72 6f 20 2e 20 23 | 5b 6e 69 6c 20 22 c0 87 |acro . #|[nil "..|
|00001a70| 22 20 5b 28 6d 65 6d 71 | 20 65 64 69 66 66 2d 6a |" [(memq| ediff-j|
|00001a80| 6f 62 2d 6e 61 6d 65 20 | 27 28 65 64 69 66 66 2d |ob-name |'(ediff-|
|00001a90| 6d 65 72 67 65 2d 66 69 | 6c 65 73 20 65 64 69 66 |merge-fi|les edif|
|00001aa0| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 20 |f-merge-|buffers |
|00001ab0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|00001ac0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00001ad0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 62 75 66 66 |ediff-me|rge-buff|
|00001ae0| 65 72 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ers-with|-ancesto|
|00001af0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |r ediff-|merge-re|
|00001b00| 76 69 73 69 6f 6e 73 20 | 65 64 69 66 66 2d 6d 65 |visions |ediff-me|
|00001b10| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |rge-revi|sions-wi|
|00001b20| 74 68 2d 61 6e 63 65 73 | 74 6f 72 29 29 5d 20 31 |th-ances|tor))] 1|
|00001b30| 5d 29 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 |])).#@2 |..(defva|
|00001b40| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |r ediff-|merge-jo|
|00001b50| 62 20 6e 69 6c 20 28 23 | 24 20 2e 20 36 39 36 38 |b nil (#|$ . 6968|
|00001b60| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00001b70| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00001b80| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00001b90| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 6d 65 72 |-local e|diff-mer|
|00001ba0| 67 65 2d 6a 6f 62 20 70 | 75 74 20 70 65 72 6d 61 |ge-job p|ut perma|
|00001bb0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00001bc0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001bd0| 66 2d 6d 65 72 67 65 2d | 77 69 74 68 2d 61 6e 63 |f-merge-|with-anc|
|00001be0| 65 73 74 6f 72 2d 6a 6f | 62 20 27 28 6d 61 63 72 |estor-jo|b '(macr|
|00001bf0| 6f 20 2e 20 23 5b 6e 69 | 6c 20 22 c0 87 22 20 5b |o . #[ni|l ".." [|
|00001c00| 28 6d 65 6d 71 20 65 64 | 69 66 66 2d 6a 6f 62 2d |(memq ed|iff-job-|
|00001c10| 6e 61 6d 65 20 27 28 65 | 64 69 66 66 2d 6d 65 72 |name '(e|diff-mer|
|00001c20| 67 65 2d 66 69 6c 65 73 | 2d 77 69 74 68 2d 61 6e |ge-files|-with-an|
|00001c30| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00001c40| 67 65 2d 62 75 66 66 65 | 72 73 2d 77 69 74 68 2d |ge-buffe|rs-with-|
|00001c50| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 6d |ancestor| ediff-m|
|00001c60| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |erge-rev|isions-w|
|00001c70| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 29 5d 20 |ith-ance|stor))] |
|00001c80| 31 5d 29 29 0a 23 40 32 | 20 1f 0a 28 64 65 66 76 |1])).#@2| ..(defv|
|00001c90| 61 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 77 |ar ediff|-merge-w|
|00001ca0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 2d 6a 6f 62 |ith-ance|stor-job|
|00001cb0| 20 6e 69 6c 20 28 23 24 | 20 2e 20 37 33 30 35 29 | nil (#$| . 7305)|
|00001cc0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00001cd0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00001ce0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00001cf0| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 6d 65 72 67 |local ed|iff-merg|
|00001d00| 65 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 2d |e-with-a|ncestor-|
|00001d10| 6a 6f 62 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |job put |permanen|
|00001d20| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00001d30| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 33 |efalias |'ediff-3|
|00001d40| 77 61 79 2d 6a 6f 62 20 | 27 28 6d 61 63 72 6f 20 |way-job |'(macro |
|00001d50| 2e 20 23 5b 6e 69 6c 20 | 22 c0 87 22 20 5b 28 6f |. #[nil |".." [(o|
|00001d60| 72 20 65 64 69 66 66 2d | 33 77 61 79 2d 63 6f 6d |r ediff-|3way-com|
|00001d70| 70 61 72 69 73 6f 6e 2d | 6a 6f 62 20 65 64 69 66 |parison-|job edif|
|00001d80| 66 2d 6d 65 72 67 65 2d | 6a 6f 62 29 5d 20 31 5d |f-merge-|job)] 1]|
|00001d90| 29 29 0a 23 40 32 20 1f | 0a 28 64 65 66 76 61 72 |)).#@2 .|.(defvar|
|00001da0| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 6a 6f 62 20 | ediff-3|way-job |
|00001db0| 6e 69 6c 20 28 23 24 20 | 2e 20 37 35 37 35 29 29 |nil (#$ |. 7575))|
|00001dc0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00001dd0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00001de0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00001df0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 33 77 61 79 2d |ocal edi|ff-3way-|
|00001e00| 6a 6f 62 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |job put |permanen|
|00001e10| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00001e20| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 64 |efalias |'ediff-d|
|00001e30| 69 66 66 33 2d 6a 6f 62 | 20 27 28 6d 61 63 72 6f |iff3-job| '(macro|
|00001e40| 20 2e 20 23 5b 6e 69 6c | 20 22 c0 87 22 20 5b 28 | . #[nil| ".." [(|
|00001e50| 6f 72 20 65 64 69 66 66 | 2d 33 77 61 79 2d 63 6f |or ediff|-3way-co|
|00001e60| 6d 70 61 72 69 73 6f 6e | 2d 6a 6f 62 20 65 64 69 |mparison|-job edi|
|00001e70| 66 66 2d 6d 65 72 67 65 | 2d 77 69 74 68 2d 61 6e |ff-merge|-with-an|
|00001e80| 63 65 73 74 6f 72 2d 6a | 6f 62 29 5d 20 31 5d 29 |cestor-j|ob)] 1])|
|00001e90| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00001ea0| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 6a 6f 62 20 |ediff-di|ff3-job |
|00001eb0| 6e 69 6c 20 28 23 24 20 | 2e 20 37 38 33 30 29 29 |nil (#$ |. 7830))|
|00001ec0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00001ed0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00001ee0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00001ef0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 69 66 66 33 |ocal edi|ff-diff3|
|00001f00| 2d 6a 6f 62 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |-job put| permane|
|00001f10| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 28 |nt-local| t] 4).(|
|00001f20| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00001f30| 77 69 6e 64 6f 77 73 2d | 6a 6f 62 20 27 28 6d 61 |windows-|job '(ma|
|00001f40| 63 72 6f 20 2e 20 23 5b | 6e 69 6c 20 22 c0 87 22 |cro . #[|nil ".."|
|00001f50| 20 5b 28 6d 65 6d 71 20 | 65 64 69 66 66 2d 6a 6f | [(memq |ediff-jo|
|00001f60| 62 2d 6e 61 6d 65 20 27 | 28 65 64 69 66 66 2d 77 |b-name '|(ediff-w|
|00001f70| 69 6e 64 6f 77 73 2d 77 | 6f 72 64 77 69 73 65 20 |indows-w|ordwise |
|00001f80| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 6c 69 |ediff-wi|ndows-li|
|00001f90| 6e 65 77 69 73 65 29 29 | 5d 20 31 5d 29 29 0a 23 |newise))|] 1])).#|
|00001fa0| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00001fb0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 6a 6f 62 20 6e |ff-windo|ws-job n|
|00001fc0| 69 6c 20 28 23 24 20 2e | 20 38 30 39 39 29 29 0a |il (#$ .| 8099)).|
|00001fd0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00001fe0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00001ff0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00002000| 63 61 6c 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |cal edif|f-window|
|00002010| 73 2d 6a 6f 62 20 70 75 | 74 20 70 65 72 6d 61 6e |s-job pu|t perman|
|00002020| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00002030| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00002040| 2d 77 6f 72 64 2d 6d 6f | 64 65 2d 6a 6f 62 20 27 |-word-mo|de-job '|
|00002050| 28 6d 61 63 72 6f 20 2e | 20 23 5b 6e 69 6c 20 22 |(macro .| #[nil "|
|00002060| c0 87 22 20 5b 28 6d 65 | 6d 71 20 65 64 69 66 66 |.." [(me|mq ediff|
|00002070| 2d 6a 6f 62 2d 6e 61 6d | 65 20 27 28 65 64 69 66 |-job-nam|e '(edif|
|00002080| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|00002090| 73 65 20 65 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |se ediff|-regions|
|000020a0| 2d 77 6f 72 64 77 69 73 | 65 29 29 5d 20 31 5d 29 |-wordwis|e))] 1])|
|000020b0| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|000020c0| 65 64 69 66 66 2d 77 6f | 72 64 2d 6d 6f 64 65 2d |ediff-wo|rd-mode-|
|000020d0| 6a 6f 62 20 6e 69 6c 20 | 28 23 24 20 2e 20 38 33 |job nil |(#$ . 83|
|000020e0| 37 34 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |74)).(by|te-code |
|000020f0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00002100| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00002110| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 77 |er-local| ediff-w|
|00002120| 6f 72 64 2d 6d 6f 64 65 | 2d 6a 6f 62 20 70 75 74 |ord-mode|-job put|
|00002130| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00002140| 20 74 5d 20 34 29 0a 28 | 64 65 66 61 6c 69 61 73 | t] 4).(|defalias|
|00002150| 20 27 65 64 69 66 66 2d | 6e 61 72 72 6f 77 2d 6a | 'ediff-|narrow-j|
|00002160| 6f 62 20 27 28 6d 61 63 | 72 6f 20 2e 20 23 5b 6e |ob '(mac|ro . #[n|
|00002170| 69 6c 20 22 c0 87 22 20 | 5b 28 6d 65 6d 71 20 65 |il ".." |[(memq e|
|00002180| 64 69 66 66 2d 6a 6f 62 | 2d 6e 61 6d 65 20 27 28 |diff-job|-name '(|
|00002190| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 77 6f |ediff-wi|ndows-wo|
|000021a0| 72 64 77 69 73 65 20 65 | 64 69 66 66 2d 72 65 67 |rdwise e|diff-reg|
|000021b0| 69 6f 6e 73 2d 77 6f 72 | 64 77 69 73 65 20 65 64 |ions-wor|dwise ed|
|000021c0| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 6c 69 6e 65 |iff-wind|ows-line|
|000021d0| 77 69 73 65 20 65 64 69 | 66 66 2d 72 65 67 69 6f |wise edi|ff-regio|
|000021e0| 6e 73 2d 6c 69 6e 65 77 | 69 73 65 29 29 5d 20 31 |ns-linew|ise))] 1|
|000021f0| 5d 29 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 |])).#@2 |..(defva|
|00002200| 72 20 65 64 69 66 66 2d | 6e 61 72 72 6f 77 2d 6a |r ediff-|narrow-j|
|00002210| 6f 62 20 6e 69 6c 20 28 | 23 24 20 2e 20 38 36 39 |ob nil (|#$ . 869|
|00002220| 36 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |6)).(byt|e-code "|
|00002230| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00002240| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00002250| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 6e 61 |r-local |ediff-na|
|00002260| 72 72 6f 77 2d 6a 6f 62 | 20 70 75 74 20 70 65 72 |rrow-job| put per|
|00002270| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|00002280| 34 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |4).(defa|lias 'ed|
|00002290| 69 66 66 2d 61 6e 63 65 | 73 74 6f 72 2d 6d 65 74 |iff-ance|stor-met|
|000022a0| 61 6a 6f 62 20 23 5b 28 | 26 6f 70 74 69 6f 6e 61 |ajob #[(|&optiona|
|000022b0| 6c 20 6d 65 74 61 6a 6f | 62 29 20 22 08 ae 81 09 |l metajo|b) "....|
|000022c0| c2 73 87 22 20 5b 6d 65 | 74 61 6a 6f 62 20 65 64 |.s." [me|tajob ed|
|000022d0| 69 66 66 2d 6d 65 74 61 | 6a 6f 62 2d 6e 61 6d 65 |iff-meta|job-name|
|000022e0| 20 28 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 | (ediff-|merge-di|
|000022f0| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00002300| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00002310| 72 67 65 2d 66 69 6c 65 | 67 72 6f 75 70 73 2d 77 |rge-file|groups-w|
|00002320| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 5d 20 32 |ith-ance|stor)] 2|
|00002330| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|00002340| c1 4e c2 73 ac 85 c3 c4 | c0 5c 22 88 c5 c0 c1 c6 |.N.s....|.\".....|
|00002350| 23 87 22 20 5b 65 64 69 | 66 66 2d 61 6e 63 65 73 |#." [edi|ff-ances|
|00002360| 74 6f 72 2d 6d 65 74 61 | 6a 6f 62 20 62 79 74 65 |tor-meta|job byte|
|00002370| 2d 6f 70 74 69 6d 69 7a | 65 72 20 28 6e 69 6c 20 |-optimiz|er (nil |
|00002380| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|00002390| 69 6e 65 2d 65 78 70 61 | 6e 64 29 20 65 72 72 6f |ine-expa|nd) erro|
|000023a0| 72 20 22 25 73 20 61 6c | 72 65 61 64 79 20 68 61 |r "%s al|ready ha|
|000023b0| 73 20 61 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |s a byte|-optimiz|
|000023c0| 65 72 2c 20 63 61 6e 27 | 74 20 6d 61 6b 65 20 69 |er, can'|t make i|
|000023d0| 74 20 69 6e 6c 69 6e 65 | 22 20 70 75 74 20 62 79 |t inline|" put by|
|000023e0| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|000023f0| 65 2d 65 78 70 61 6e 64 | 5d 20 34 29 0a 28 64 65 |e-expand|] 4).(de|
|00002400| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 72 65 |falias '|ediff-re|
|00002410| 76 69 73 69 6f 6e 2d 6d | 65 74 61 6a 6f 62 20 23 |vision-m|etajob #|
|00002420| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 6d 65 74 61 |[(&optio|nal meta|
|00002430| 6a 6f 62 29 20 22 08 ae | 81 09 c2 73 87 22 20 5b |job) "..|...s." [|
|00002440| 6d 65 74 61 6a 6f 62 20 | 65 64 69 66 66 2d 6d 65 |metajob |ediff-me|
|00002450| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 28 65 64 69 66 |tajob-na|me (edif|
|00002460| 66 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |f-direct|ory-revi|
|00002470| 73 69 6f 6e 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |sions ed|iff-merg|
|00002480| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00002490| 73 69 6f 6e 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |sions ed|iff-merg|
|000024a0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|000024b0| 73 69 6f 6e 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |sions-wi|th-ances|
|000024c0| 74 6f 72 29 5d 20 32 5d | 29 0a 28 62 79 74 65 2d |tor)] 2]|).(byte-|
|000024d0| 63 6f 64 65 20 22 c0 c1 | 4e c2 73 ac 85 c3 c4 c0 |code "..|N.s.....|
|000024e0| 5c 22 88 c5 c0 c1 c6 23 | 87 22 20 5b 65 64 69 66 |\".....#|." [edif|
|000024f0| 66 2d 72 65 76 69 73 69 | 6f 6e 2d 6d 65 74 61 6a |f-revisi|on-metaj|
|00002500| 6f 62 20 62 79 74 65 2d | 6f 70 74 69 6d 69 7a 65 |ob byte-|optimize|
|00002510| 72 20 28 6e 69 6c 20 62 | 79 74 65 2d 63 6f 6d 70 |r (nil b|yte-comp|
|00002520| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00002530| 64 29 20 65 72 72 6f 72 | 20 22 25 73 20 61 6c 72 |d) error| "%s alr|
|00002540| 65 61 64 79 20 68 61 73 | 20 61 20 62 79 74 65 2d |eady has| a byte-|
|00002550| 6f 70 74 69 6d 69 7a 65 | 72 2c 20 63 61 6e 27 74 |optimize|r, can't|
|00002560| 20 6d 61 6b 65 20 69 74 | 20 69 6e 6c 69 6e 65 22 | make it| inline"|
|00002570| 20 70 75 74 20 62 79 74 | 65 2d 63 6f 6d 70 69 6c | put byt|e-compil|
|00002580| 65 2d 69 6e 6c 69 6e 65 | 2d 65 78 70 61 6e 64 5d |e-inline|-expand]|
|00002590| 20 34 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 | 4).(def|alias 'e|
|000025a0| 64 69 66 66 2d 70 61 74 | 63 68 2d 6d 65 74 61 6a |diff-pat|ch-metaj|
|000025b0| 6f 62 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |ob #[(&o|ptional |
|000025c0| 6d 65 74 61 6a 6f 62 29 | 20 22 08 ae 81 09 c2 73 |metajob)| ".....s|
|000025d0| 87 22 20 5b 6d 65 74 61 | 6a 6f 62 20 65 64 69 66 |." [meta|job edif|
|000025e0| 66 2d 6d 65 74 61 6a 6f | 62 2d 6e 61 6d 65 20 28 |f-metajo|b-name (|
|000025f0| 65 64 69 66 66 2d 6d 75 | 6c 74 69 66 69 6c 65 2d |ediff-mu|ltifile-|
|00002600| 70 61 74 63 68 29 5d 20 | 32 5d 29 0a 28 62 79 74 |patch)] |2]).(byt|
|00002610| 65 2d 63 6f 64 65 20 22 | c0 c1 4e c2 73 ac 85 c3 |e-code "|..N.s...|
|00002620| c4 c0 5c 22 88 c5 c0 c1 | c6 23 87 22 20 5b 65 64 |..\"....|.#." [ed|
|00002630| 69 66 66 2d 70 61 74 63 | 68 2d 6d 65 74 61 6a 6f |iff-patc|h-metajo|
|00002640| 62 20 62 79 74 65 2d 6f | 70 74 69 6d 69 7a 65 72 |b byte-o|ptimizer|
|00002650| 20 28 6e 69 6c 20 62 79 | 74 65 2d 63 6f 6d 70 69 | (nil by|te-compi|
|00002660| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00002670| 29 20 65 72 72 6f 72 20 | 22 25 73 20 61 6c 72 65 |) error |"%s alre|
|00002680| 61 64 79 20 68 61 73 20 | 61 20 62 79 74 65 2d 6f |ady has |a byte-o|
|00002690| 70 74 69 6d 69 7a 65 72 | 2c 20 63 61 6e 27 74 20 |ptimizer|, can't |
|000026a0| 6d 61 6b 65 20 69 74 20 | 69 6e 6c 69 6e 65 22 20 |make it |inline" |
|000026b0| 70 75 74 20 62 79 74 65 | 2d 63 6f 6d 70 69 6c 65 |put byte|-compile|
|000026c0| 2d 69 6e 6c 69 6e 65 2d | 65 78 70 61 6e 64 5d 20 |-inline-|expand] |
|000026d0| 34 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |4).(defa|lias 'ed|
|000026e0| 69 66 66 2d 6f 6e 65 2d | 66 69 6c 65 67 72 6f 75 |iff-one-|filegrou|
|000026f0| 70 2d 6d 65 74 61 6a 6f | 62 20 23 5b 28 26 6f 70 |p-metajo|b #[(&op|
|00002700| 74 69 6f 6e 61 6c 20 6d | 65 74 61 6a 6f 62 29 20 |tional m|etajob) |
|00002710| 22 08 89 18 ae 81 09 c2 | 73 29 ae 89 08 89 18 ae |".......|s)......|
|00002720| 81 09 c3 73 29 87 22 20 | 5b 6d 65 74 61 6a 6f 62 |...s)." |[metajob|
|00002730| 20 65 64 69 66 66 2d 6d | 65 74 61 6a 6f 62 2d 6e | ediff-m|etajob-n|
|00002740| 61 6d 65 20 28 65 64 69 | 66 66 2d 64 69 72 65 63 |ame (edi|ff-direc|
|00002750| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 20 65 |tory-rev|isions e|
|00002760| 64 69 66 66 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |diff-mer|ge-direc|
|00002770| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 20 65 |tory-rev|isions e|
|00002780| 64 69 66 66 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |diff-mer|ge-direc|
|00002790| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |tory-rev|isions-w|
|000027a0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 20 28 65 |ith-ance|stor) (e|
|000027b0| 64 69 66 66 2d 6d 75 6c | 74 69 66 69 6c 65 2d 70 |diff-mul|tifile-p|
|000027c0| 61 74 63 68 29 5d 20 33 | 5d 29 0a 28 62 79 74 65 |atch)] 3|]).(byte|
|000027d0| 2d 63 6f 64 65 20 22 c0 | c1 4e c2 73 ac 85 c3 c4 |-code ".|.N.s....|
|000027e0| c0 5c 22 88 c5 c0 c1 c6 | 23 87 22 20 5b 65 64 69 |.\".....|#." [edi|
|000027f0| 66 66 2d 6f 6e 65 2d 66 | 69 6c 65 67 72 6f 75 70 |ff-one-f|ilegroup|
|00002800| 2d 6d 65 74 61 6a 6f 62 | 20 62 79 74 65 2d 6f 70 |-metajob| byte-op|
|00002810| 74 69 6d 69 7a 65 72 20 | 28 6e 69 6c 20 62 79 74 |timizer |(nil byt|
|00002820| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|00002830| 2d 65 78 70 61 6e 64 29 | 20 65 72 72 6f 72 20 22 |-expand)| error "|
|00002840| 25 73 20 61 6c 72 65 61 | 64 79 20 68 61 73 20 61 |%s alrea|dy has a|
|00002850| 20 62 79 74 65 2d 6f 70 | 74 69 6d 69 7a 65 72 2c | byte-op|timizer,|
|00002860| 20 63 61 6e 27 74 20 6d | 61 6b 65 20 69 74 20 69 | can't m|ake it i|
|00002870| 6e 6c 69 6e 65 22 20 70 | 75 74 20 62 79 74 65 2d |nline" p|ut byte-|
|00002880| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00002890| 78 70 61 6e 64 5d 20 34 | 29 0a 28 64 65 66 61 6c |xpand] 4|).(defal|
|000028a0| 69 61 73 20 27 65 64 69 | 66 66 2d 63 6f 6c 6c 65 |ias 'edi|ff-colle|
|000028b0| 63 74 2d 64 69 66 66 73 | 2d 6d 65 74 61 6a 6f 62 |ct-diffs|-metajob|
|000028c0| 20 23 5b 28 26 6f 70 74 | 69 6f 6e 61 6c 20 6d 65 | #[(&opt|ional me|
|000028d0| 74 61 6a 6f 62 29 20 22 | 08 ae 81 09 c2 73 87 22 |tajob) "|.....s."|
|000028e0| 20 5b 6d 65 74 61 6a 6f | 62 20 65 64 69 66 66 2d | [metajo|b ediff-|
|000028f0| 6d 65 74 61 6a 6f 62 2d | 6e 61 6d 65 20 28 65 64 |metajob-|name (ed|
|00002900| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 20 |iff-dire|ctories |
|00002910| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|00002920| 72 65 76 69 73 69 6f 6e | 73 20 65 64 69 66 66 2d |revision|s ediff-|
|00002930| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|00002940| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |s ediff-|merge-di|
|00002950| 72 65 63 74 6f 72 69 65 | 73 2d 77 69 74 68 2d 61 |rectorie|s-with-a|
|00002960| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00002970| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|00002980| 76 69 73 69 6f 6e 73 20 | 65 64 69 66 66 2d 6d 65 |visions |ediff-me|
|00002990| 72 67 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |rge-dire|ctory-re|
|000029a0| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|000029b0| 65 73 74 6f 72 29 5d 20 | 32 5d 29 0a 28 62 79 74 |estor)] |2]).(byt|
|000029c0| 65 2d 63 6f 64 65 20 22 | c0 c1 4e c2 73 ac 85 c3 |e-code "|..N.s...|
|000029d0| c4 c0 5c 22 88 c5 c0 c1 | c6 23 87 22 20 5b 65 64 |..\"....|.#." [ed|
|000029e0| 69 66 66 2d 63 6f 6c 6c | 65 63 74 2d 64 69 66 66 |iff-coll|ect-diff|
|000029f0| 73 2d 6d 65 74 61 6a 6f | 62 20 62 79 74 65 2d 6f |s-metajo|b byte-o|
|00002a00| 70 74 69 6d 69 7a 65 72 | 20 28 6e 69 6c 20 62 79 |ptimizer| (nil by|
|00002a10| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|00002a20| 65 2d 65 78 70 61 6e 64 | 29 20 65 72 72 6f 72 20 |e-expand|) error |
|00002a30| 22 25 73 20 61 6c 72 65 | 61 64 79 20 68 61 73 20 |"%s alre|ady has |
|00002a40| 61 20 62 79 74 65 2d 6f | 70 74 69 6d 69 7a 65 72 |a byte-o|ptimizer|
|00002a50| 2c 20 63 61 6e 27 74 20 | 6d 61 6b 65 20 69 74 20 |, can't |make it |
|00002a60| 69 6e 6c 69 6e 65 22 20 | 70 75 74 20 62 79 74 65 |inline" |put byte|
|00002a70| 2d 63 6f 6d 70 69 6c 65 | 2d 69 6e 6c 69 6e 65 2d |-compile|-inline-|
|00002a80| 65 78 70 61 6e 64 5d 20 | 34 29 0a 28 64 65 66 61 |expand] |4).(defa|
|00002a90| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |lias 'ed|iff-merg|
|00002aa0| 65 2d 6d 65 74 61 6a 6f | 62 20 23 5b 28 26 6f 70 |e-metajo|b #[(&op|
|00002ab0| 74 69 6f 6e 61 6c 20 6d | 65 74 61 6a 6f 62 29 20 |tional m|etajob) |
|00002ac0| 22 08 ae 81 09 c2 73 87 | 22 20 5b 6d 65 74 61 6a |".....s.|" [metaj|
|00002ad0| 6f 62 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |ob ediff|-metajob|
|00002ae0| 2d 6e 61 6d 65 20 28 65 | 64 69 66 66 2d 6d 65 72 |-name (e|diff-mer|
|00002af0| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 20 65 |ge-direc|tories e|
|00002b00| 64 69 66 66 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |diff-mer|ge-direc|
|00002b10| 74 6f 72 69 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |tories-w|ith-ance|
|00002b20| 73 74 6f 72 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |stor edi|ff-merge|
|00002b30| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00002b40| 69 6f 6e 73 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |ions edi|ff-merge|
|00002b50| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00002b60| 69 6f 6e 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ions-wit|h-ancest|
|00002b70| 6f 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |or ediff|-merge-f|
|00002b80| 69 6c 65 67 72 6f 75 70 | 73 2d 77 69 74 68 2d 61 |ilegroup|s-with-a|
|00002b90| 6e 63 65 73 74 6f 72 29 | 5d 20 32 5d 29 0a 28 62 |ncestor)|] 2]).(b|
|00002ba0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 4e c2 73 ac |yte-code| "..N.s.|
|00002bb0| 85 c3 c4 c0 5c 22 88 c5 | c0 c1 c6 23 87 22 20 5b |....\"..|...#." [|
|00002bc0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6d 65 74 61 |ediff-me|rge-meta|
|00002bd0| 6a 6f 62 20 62 79 74 65 | 2d 6f 70 74 69 6d 69 7a |job byte|-optimiz|
|00002be0| 65 72 20 28 6e 69 6c 20 | 62 79 74 65 2d 63 6f 6d |er (nil |byte-com|
|00002bf0| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00002c00| 6e 64 29 20 65 72 72 6f | 72 20 22 25 73 20 61 6c |nd) erro|r "%s al|
|00002c10| 72 65 61 64 79 20 68 61 | 73 20 61 20 62 79 74 65 |ready ha|s a byte|
|00002c20| 2d 6f 70 74 69 6d 69 7a | 65 72 2c 20 63 61 6e 27 |-optimiz|er, can'|
|00002c30| 74 20 6d 61 6b 65 20 69 | 74 20 69 6e 6c 69 6e 65 |t make i|t inline|
|00002c40| 22 20 70 75 74 20 62 79 | 74 65 2d 63 6f 6d 70 69 |" put by|te-compi|
|00002c50| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00002c60| 5d 20 34 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |] 4).(de|falias '|
|00002c70| 65 64 69 66 66 2d 6d 65 | 74 61 6a 6f 62 33 20 23 |ediff-me|tajob3 #|
|00002c80| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 6d 65 74 61 |[(&optio|nal meta|
|00002c90| 6a 6f 62 29 20 22 08 ae | 81 09 c2 73 87 22 20 5b |job) "..|...s." [|
|00002ca0| 6d 65 74 61 6a 6f 62 20 | 65 64 69 66 66 2d 6d 65 |metajob |ediff-me|
|00002cb0| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 28 65 64 69 66 |tajob-na|me (edif|
|00002cc0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002cd0| 69 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ies-with|-ancesto|
|00002ce0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 66 69 |r ediff-|merge-fi|
|00002cf0| 6c 65 67 72 6f 75 70 73 | 2d 77 69 74 68 2d 61 6e |legroups|-with-an|
|00002d00| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 64 69 72 |cestor e|diff-dir|
|00002d10| 65 63 74 6f 72 69 65 73 | 33 20 65 64 69 66 66 2d |ectories|3 ediff-|
|00002d20| 66 69 6c 65 67 72 6f 75 | 70 73 33 29 5d 20 32 5d |filegrou|ps3)] 2]|
|00002d30| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002d40| 4e c2 73 ac 85 c3 c4 c0 | 5c 22 88 c5 c0 c1 c6 23 |N.s.....|\".....#|
|00002d50| 87 22 20 5b 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |." [edif|f-metajo|
|00002d60| 62 33 20 62 79 74 65 2d | 6f 70 74 69 6d 69 7a 65 |b3 byte-|optimize|
|00002d70| 72 20 28 6e 69 6c 20 62 | 79 74 65 2d 63 6f 6d 70 |r (nil b|yte-comp|
|00002d80| 69 6c 65 2d 69 6e 6c 69 | 6e 65 2d 65 78 70 61 6e |ile-inli|ne-expan|
|00002d90| 64 29 20 65 72 72 6f 72 | 20 22 25 73 20 61 6c 72 |d) error| "%s alr|
|00002da0| 65 61 64 79 20 68 61 73 | 20 61 20 62 79 74 65 2d |eady has| a byte-|
|00002db0| 6f 70 74 69 6d 69 7a 65 | 72 2c 20 63 61 6e 27 74 |optimize|r, can't|
|00002dc0| 20 6d 61 6b 65 20 69 74 | 20 69 6e 6c 69 6e 65 22 | make it| inline"|
|00002dd0| 20 70 75 74 20 62 79 74 | 65 2d 63 6f 6d 70 69 6c | put byt|e-compil|
|00002de0| 65 2d 69 6e 6c 69 6e 65 | 2d 65 78 70 61 6e 64 5d |e-inline|-expand]|
|00002df0| 20 34 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 | 4).(def|alias 'e|
|00002e00| 64 69 66 66 2d 63 6f 6d | 70 61 72 69 73 6f 6e 2d |diff-com|parison-|
|00002e10| 6d 65 74 61 6a 6f 62 33 | 20 23 5b 28 26 6f 70 74 |metajob3| #[(&opt|
|00002e20| 69 6f 6e 61 6c 20 6d 65 | 74 61 6a 6f 62 29 20 22 |ional me|tajob) "|
|00002e30| 08 ae 81 09 c2 73 87 22 | 20 5b 6d 65 74 61 6a 6f |.....s."| [metajo|
|00002e40| 62 20 65 64 69 66 66 2d | 6d 65 74 61 6a 6f 62 2d |b ediff-|metajob-|
|00002e50| 6e 61 6d 65 20 28 65 64 | 69 66 66 2d 64 69 72 65 |name (ed|iff-dire|
|00002e60| 63 74 6f 72 69 65 73 33 | 20 65 64 69 66 66 2d 66 |ctories3| ediff-f|
|00002e70| 69 6c 65 67 72 6f 75 70 | 73 33 29 5d 20 32 5d 29 |ilegroup|s3)] 2])|
|00002e80| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 4e |.(byte-c|ode "..N|
|00002e90| c2 73 ac 85 c3 c4 c0 5c | 22 88 c5 c0 c1 c6 23 87 |.s.....\|".....#.|
|00002ea0| 22 20 5b 65 64 69 66 66 | 2d 63 6f 6d 70 61 72 69 |" [ediff|-compari|
|00002eb0| 73 6f 6e 2d 6d 65 74 61 | 6a 6f 62 33 20 62 79 74 |son-meta|job3 byt|
|00002ec0| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 20 28 6e 69 6c |e-optimi|zer (nil|
|00002ed0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|00002ee0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 29 20 65 72 72 |line-exp|and) err|
|00002ef0| 6f 72 20 22 25 73 20 61 | 6c 72 65 61 64 79 20 68 |or "%s a|lready h|
|00002f00| 61 73 20 61 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |as a byt|e-optimi|
|00002f10| 7a 65 72 2c 20 63 61 6e | 27 74 20 6d 61 6b 65 20 |zer, can|'t make |
|00002f20| 69 74 20 69 6e 6c 69 6e | 65 22 20 70 75 74 20 62 |it inlin|e" put b|
|00002f30| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|00002f40| 6e 65 2d 65 78 70 61 6e | 64 5d 20 34 29 0a 28 64 |ne-expan|d] 4).(d|
|00002f50| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 69 |efalias |'ediff-i|
|00002f60| 6e 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |n-contro|l-buffer|
|00002f70| 2d 70 20 23 5b 28 26 6f | 70 74 69 6f 6e 61 6c 20 |-p #[(&o|ptional |
|00002f80| 6d 65 74 61 2d 62 75 66 | 2d 70 29 20 22 c0 c1 21 |meta-buf|-p) "..!|
|00002f90| ad 89 5c 6e ab 83 0b aa | 81 09 70 61 87 22 20 5b |..\n....|..pa." [|
|00002fa0| 62 6f 75 6e 64 70 20 65 | 64 69 66 66 2d 63 6f 6e |boundp e|diff-con|
|00002fb0| 74 72 6f 6c 2d 62 75 66 | 66 65 72 20 6d 65 74 61 |trol-buf|fer meta|
|00002fc0| 2d 62 75 66 2d 70 20 65 | 64 69 66 66 2d 6d 65 74 |-buf-p e|diff-met|
|00002fd0| 61 2d 62 75 66 66 65 72 | 5d 20 32 5d 29 0a 28 64 |a-buffer|] 2]).(d|
|00002fe0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 62 |efalias |'ediff-b|
|00002ff0| 61 72 66 2d 69 66 2d 6e | 6f 74 2d 63 6f 6e 74 72 |arf-if-n|ot-contr|
|00003000| 6f 6c 2d 62 75 66 66 65 | 72 20 23 5b 28 26 6f 70 |ol-buffe|r #[(&op|
|00003010| 74 69 6f 6e 61 6c 20 6d | 65 74 61 2d 62 75 66 2d |tional m|eta-buf-|
|00003020| 70 29 20 22 c0 09 21 ae | 84 c2 c3 0c 5c 22 87 22 |p) "..!.|....\"."|
|00003030| 20 5b 65 64 69 66 66 2d | 69 6e 2d 63 6f 6e 74 72 | [ediff-|in-contr|
|00003040| 6f 6c 2d 62 75 66 66 65 | 72 2d 70 20 6d 65 74 61 |ol-buffe|r-p meta|
|00003050| 2d 62 75 66 2d 70 20 65 | 72 72 6f 72 20 22 25 53 |-buf-p e|rror "%S|
|00003060| 3a 20 54 68 69 73 20 63 | 6f 6d 6d 61 6e 64 20 72 |: This c|ommand r|
|00003070| 75 6e 73 20 69 6e 20 45 | 64 69 66 66 20 43 6f 6e |uns in E|diff Con|
|00003080| 74 72 6f 6c 20 42 75 66 | 66 65 72 20 6f 6e 6c 79 |trol Buf|fer only|
|00003090| 21 22 20 74 68 69 73 2d | 63 6f 6d 6d 61 6e 64 5d |!" this-|command]|
|000030a0| 20 33 5d 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 | 3]).(by|te-code |
|000030b0| 22 c0 c1 4e c2 73 ac 85 | c3 c4 c0 5c 22 88 c5 c0 |"..N.s..|...\"...|
|000030c0| c1 c6 23 88 c7 c8 c9 ca | cb cc cd ce 26 07 88 c7 |..#.....|....&...|
|000030d0| cf c9 d0 cb cc cd ce 26 | 07 88 c7 d1 c9 d2 cb cc |.......&|........|
|000030e0| cd ce 26 07 87 22 20 5b | 65 64 69 66 66 2d 62 61 |..&.." [|ediff-ba|
|000030f0| 72 66 2d 69 66 2d 6e 6f | 74 2d 63 6f 6e 74 72 6f |rf-if-no|t-contro|
|00003100| 6c 2d 62 75 66 66 65 72 | 20 62 79 74 65 2d 6f 70 |l-buffer| byte-op|
|00003110| 74 69 6d 69 7a 65 72 20 | 28 6e 69 6c 20 62 79 74 |timizer |(nil byt|
|00003120| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|00003130| 2d 65 78 70 61 6e 64 29 | 20 65 72 72 6f 72 20 22 |-expand)| error "|
|00003140| 25 73 20 61 6c 72 65 61 | 64 79 20 68 61 73 20 61 |%s alrea|dy has a|
|00003150| 20 62 79 74 65 2d 6f 70 | 74 69 6d 69 7a 65 72 2c | byte-op|timizer,|
|00003160| 20 63 61 6e 27 74 20 6d | 61 6b 65 20 69 74 20 69 | can't m|ake it i|
|00003170| 6e 6c 69 6e 65 22 20 70 | 75 74 20 62 79 74 65 2d |nline" p|ut byte-|
|00003180| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00003190| 78 70 61 6e 64 20 63 75 | 73 74 6f 6d 2d 64 65 63 |xpand cu|stom-dec|
|000031a0| 6c 61 72 65 2d 67 72 6f | 75 70 20 65 64 69 66 66 |lare-gro|up ediff|
|000031b0| 2d 68 69 67 68 6c 69 67 | 68 74 69 6e 67 20 6e 69 |-highlig|hting ni|
|000031c0| 6c 20 22 48 69 6c 69 67 | 68 74 69 6e 67 20 6f 66 |l "Hilig|hting of|
|000031d0| 20 64 69 66 66 65 72 65 | 6e 63 65 20 72 65 67 69 | differe|nce regi|
|000031e0| 6f 6e 73 20 69 6e 20 45 | 64 69 66 66 22 20 3a 70 |ons in E|diff" :p|
|000031f0| 72 65 66 69 78 20 22 65 | 64 69 66 66 2d 22 20 3a |refix "e|diff-" :|
|00003200| 67 72 6f 75 70 20 65 64 | 69 66 66 20 65 64 69 66 |group ed|iff edif|
|00003210| 66 2d 6d 65 72 67 65 20 | 22 4d 65 72 67 69 6e 67 |f-merge |"Merging|
|00003220| 20 75 74 69 6c 69 74 69 | 65 73 22 20 65 64 69 66 | utiliti|es" edif|
|00003230| 66 2d 68 6f 6f 6b 20 22 | 48 6f 6f 6b 73 20 63 61 |f-hook "|Hooks ca|
|00003240| 6c 6c 65 64 20 62 79 20 | 45 64 69 66 66 22 5d 20 |lled by |Ediff"] |
|00003250| 38 29 0a 28 63 75 73 74 | 6f 6d 2d 64 65 63 6c 61 |8).(cust|om-decla|
|00003260| 72 65 2d 76 61 72 69 61 | 62 6c 65 20 27 65 64 69 |re-varia|ble 'edi|
|00003270| 66 66 2d 62 65 66 6f 72 | 65 2d 73 65 74 75 70 2d |ff-befor|e-setup-|
|00003280| 77 69 6e 64 6f 77 73 2d | 68 6f 6f 6b 20 27 6e 69 |windows-|hook 'ni|
|00003290| 6c 20 22 2a 48 6f 6f 6b | 73 20 74 6f 20 72 75 6e |l "*Hook|s to run|
|000032a0| 20 62 65 66 6f 72 65 20 | 45 64 69 66 66 20 73 65 | before |Ediff se|
|000032b0| 74 73 20 69 74 73 20 77 | 69 6e 64 6f 77 20 63 6f |ts its w|indow co|
|000032c0| 6e 66 69 67 75 72 61 74 | 69 6f 6e 2e 20 5c 6e 54 |nfigurat|ion. \nT|
|000032d0| 68 69 73 20 63 61 6e 20 | 62 65 20 75 73 65 64 20 |his can |be used |
|000032e0| 74 6f 20 73 61 76 65 20 | 74 68 65 20 70 72 65 76 |to save |the prev|
|000032f0| 69 6f 75 73 20 77 69 6e | 64 6f 77 20 63 6f 6e 66 |ious win|dow conf|
|00003300| 69 67 2c 20 77 68 69 63 | 68 20 63 61 6e 20 62 65 |ig, whic|h can be|
|00003310| 20 72 65 73 74 6f 72 65 | 64 5c 6e 6f 6e 20 65 64 | restore|d\non ed|
|00003320| 69 66 66 2d 71 75 69 74 | 20 6f 72 20 65 64 69 66 |iff-quit| or edif|
|00003330| 66 2d 73 75 73 70 65 6e | 64 2e 22 20 3a 74 79 70 |f-suspen|d." :typ|
|00003340| 65 20 27 68 6f 6f 6b 20 | 3a 67 72 6f 75 70 20 27 |e 'hook |:group '|
|00003350| 65 64 69 66 66 2d 68 6f | 6f 6b 29 0a 28 63 75 73 |ediff-ho|ok).(cus|
|00003360| 74 6f 6d 2d 64 65 63 6c | 61 72 65 2d 76 61 72 69 |tom-decl|are-vari|
|00003370| 61 62 6c 65 20 27 65 64 | 69 66 66 2d 61 66 74 65 |able 'ed|iff-afte|
|00003380| 72 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 2d |r-setup-|windows-|
|00003390| 68 6f 6f 6b 20 27 6e 69 | 6c 20 22 2a 48 6f 6f 6b |hook 'ni|l "*Hook|
|000033a0| 73 20 74 6f 20 72 75 6e | 20 61 66 74 65 72 20 45 |s to run| after E|
|000033b0| 64 69 66 66 20 73 65 74 | 73 20 69 74 73 20 77 69 |diff set|s its wi|
|000033c0| 6e 64 6f 77 20 63 6f 6e | 66 69 67 75 72 61 74 69 |ndow con|figurati|
|000033d0| 6f 6e 2e 20 5c 6e 54 68 | 69 73 20 63 61 6e 20 62 |on. \nTh|is can b|
|000033e0| 65 20 75 73 65 64 20 74 | 6f 20 73 65 74 20 75 70 |e used t|o set up|
|000033f0| 20 63 6f 6e 74 72 6f 6c | 20 77 69 6e 64 6f 77 20 | control| window |
|00003400| 6f 72 20 69 63 6f 6e 20 | 69 6e 20 61 20 64 65 73 |or icon |in a des|
|00003410| 69 72 65 64 20 70 6c 61 | 63 65 2e 22 20 3a 74 79 |ired pla|ce." :ty|
|00003420| 70 65 20 27 68 6f 6f 6b | 20 3a 67 72 6f 75 70 20 |pe 'hook| :group |
|00003430| 27 65 64 69 66 66 2d 68 | 6f 6f 6b 29 0a 28 63 75 |'ediff-h|ook).(cu|
|00003440| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00003450| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 62 65 66 |iable 'e|diff-bef|
|00003460| 6f 72 65 2d 73 65 74 75 | 70 2d 63 6f 6e 74 72 6f |ore-setu|p-contro|
|00003470| 6c 2d 66 72 61 6d 65 2d | 68 6f 6f 6b 20 27 6e 69 |l-frame-|hook 'ni|
|00003480| 6c 20 22 2a 48 6f 6f 6b | 73 20 72 75 6e 20 62 65 |l "*Hook|s run be|
|00003490| 66 6f 72 65 20 73 65 74 | 74 69 6e 67 20 75 70 20 |fore set|ting up |
|000034a0| 74 68 65 20 66 72 61 6d | 65 20 74 6f 20 64 69 73 |the fram|e to dis|
|000034b0| 70 6c 61 79 20 45 64 69 | 66 66 20 43 6f 6e 74 72 |play Edi|ff Contr|
|000034c0| 6f 6c 20 50 61 6e 65 6c | 2e 5c 6e 43 61 6e 20 62 |ol Panel|.\nCan b|
|000034d0| 65 20 75 73 65 64 20 74 | 6f 20 63 68 61 6e 67 65 |e used t|o change|
|000034e0| 20 63 6f 6e 74 72 6f 6c | 20 66 72 61 6d 65 20 70 | control| frame p|
|000034f0| 61 72 61 6d 65 74 65 72 | 73 20 74 6f 20 70 6f 73 |arameter|s to pos|
|00003500| 69 74 69 6f 6e 20 69 74 | 20 77 68 65 72 65 20 69 |ition it| where i|
|00003510| 74 5c 6e 69 73 20 64 65 | 73 69 72 61 62 6c 65 2e |t\nis de|sirable.|
|00003520| 22 20 3a 74 79 70 65 20 | 27 68 6f 6f 6b 20 3a 67 |" :type |'hook :g|
|00003530| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 68 6f 6f 6b |roup 'ed|iff-hook|
|00003540| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00003550| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00003560| 66 2d 61 66 74 65 72 2d | 73 65 74 75 70 2d 63 6f |f-after-|setup-co|
|00003570| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 2d 68 6f 6f 6b |ntrol-fr|ame-hook|
|00003580| 20 27 6e 69 6c 20 22 2a | 48 6f 6f 6b 73 20 72 75 | 'nil "*|Hooks ru|
|00003590| 6e 20 61 66 74 65 72 20 | 73 65 74 74 69 6e 67 20 |n after |setting |
|000035a0| 75 70 20 74 68 65 20 66 | 72 61 6d 65 20 74 6f 20 |up the f|rame to |
|000035b0| 64 69 73 70 6c 61 79 20 | 45 64 69 66 66 20 43 6f |display |Ediff Co|
|000035c0| 6e 74 72 6f 6c 20 50 61 | 6e 65 6c 2e 5c 6e 43 61 |ntrol Pa|nel.\nCa|
|000035d0| 6e 20 62 65 20 75 73 65 | 64 20 74 6f 20 6d 6f 76 |n be use|d to mov|
|000035e0| 65 20 74 68 65 20 66 72 | 61 6d 65 20 77 68 65 72 |e the fr|ame wher|
|000035f0| 65 20 69 74 20 69 73 20 | 64 65 73 69 72 65 64 2e |e it is |desired.|
|00003600| 22 20 3a 74 79 70 65 20 | 27 68 6f 6f 6b 20 3a 67 |" :type |'hook :g|
|00003610| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 68 6f 6f 6b |roup 'ed|iff-hook|
|00003620| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|00003630| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|00003640| 66 2d 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 20 27 |f-startu|p-hook '|
|00003650| 6e 69 6c 20 22 2a 48 6f | 6f 6b 73 20 74 6f 20 72 |nil "*Ho|oks to r|
|00003660| 75 6e 20 69 6e 20 74 68 | 65 20 63 6f 6e 74 72 6f |un in th|e contro|
|00003670| 6c 20 62 75 66 66 65 72 | 20 61 66 74 65 72 20 45 |l buffer| after E|
|00003680| 64 69 66 66 20 68 61 73 | 20 62 65 65 6e 20 73 65 |diff has| been se|
|00003690| 74 20 75 70 2e 22 20 3a | 74 79 70 65 20 27 68 6f |t up." :|type 'ho|
|000036a0| 6f 6b 20 3a 67 72 6f 75 | 70 20 27 65 64 69 66 66 |ok :grou|p 'ediff|
|000036b0| 2d 68 6f 6f 6b 29 0a 28 | 63 75 73 74 6f 6d 2d 64 |-hook).(|custom-d|
|000036c0| 65 63 6c 61 72 65 2d 76 | 61 72 69 61 62 6c 65 20 |eclare-v|ariable |
|000036d0| 27 65 64 69 66 66 2d 73 | 65 6c 65 63 74 2d 68 6f |'ediff-s|elect-ho|
|000036e0| 6f 6b 20 27 6e 69 6c 20 | 22 2a 48 6f 6f 6b 73 20 |ok 'nil |"*Hooks |
|000036f0| 74 6f 20 72 75 6e 20 61 | 66 74 65 72 20 61 20 64 |to run a|fter a d|
|00003700| 69 66 66 65 72 65 6e 63 | 65 20 68 61 73 20 62 65 |ifferenc|e has be|
|00003710| 65 6e 20 73 65 6c 65 63 | 74 65 64 2e 22 20 3a 74 |en selec|ted." :t|
|00003720| 79 70 65 20 27 68 6f 6f | 6b 20 3a 67 72 6f 75 70 |ype 'hoo|k :group|
|00003730| 20 27 65 64 69 66 66 2d | 68 6f 6f 6b 29 0a 28 63 | 'ediff-|hook).(c|
|00003740| 75 73 74 6f 6d 2d 64 65 | 63 6c 61 72 65 2d 76 61 |ustom-de|clare-va|
|00003750| 72 69 61 62 6c 65 20 27 | 65 64 69 66 66 2d 75 6e |riable '|ediff-un|
|00003760| 73 65 6c 65 63 74 2d 68 | 6f 6f 6b 20 27 6e 69 6c |select-h|ook 'nil|
|00003770| 20 22 2a 48 6f 6f 6b 73 | 20 74 6f 20 72 75 6e 20 | "*Hooks| to run |
|00003780| 61 66 74 65 72 20 61 20 | 64 69 66 66 65 72 65 6e |after a |differen|
|00003790| 63 65 20 68 61 73 20 62 | 65 65 6e 20 75 6e 73 65 |ce has b|een unse|
|000037a0| 6c 65 63 74 65 64 2e 22 | 20 3a 74 79 70 65 20 27 |lected."| :type '|
|000037b0| 68 6f 6f 6b 20 3a 67 72 | 6f 75 70 20 27 65 64 69 |hook :gr|oup 'edi|
|000037c0| 66 66 2d 68 6f 6f 6b 29 | 0a 28 63 75 73 74 6f 6d |ff-hook)|.(custom|
|000037d0| 2d 64 65 63 6c 61 72 65 | 2d 76 61 72 69 61 62 6c |-declare|-variabl|
|000037e0| 65 20 27 65 64 69 66 66 | 2d 70 72 65 70 61 72 65 |e 'ediff|-prepare|
|000037f0| 2d 62 75 66 66 65 72 2d | 68 6f 6f 6b 20 27 6e 69 |-buffer-|hook 'ni|
|00003800| 6c 20 22 2a 48 6f 6f 6b | 73 20 63 61 6c 6c 65 64 |l "*Hook|s called|
|00003810| 20 61 66 74 65 72 20 62 | 75 66 66 65 72 73 20 41 | after b|uffers A|
|00003820| 2c 20 42 2c 20 61 6e 64 | 20 43 20 61 72 65 20 73 |, B, and| C are s|
|00003830| 65 74 20 75 70 2e 22 20 | 3a 74 79 70 65 20 27 68 |et up." |:type 'h|
|00003840| 6f 6f 6b 20 3a 67 72 6f | 75 70 20 27 65 64 69 66 |ook :gro|up 'edif|
|00003850| 66 2d 68 6f 6f 6b 29 0a | 28 63 75 73 74 6f 6d 2d |f-hook).|(custom-|
|00003860| 64 65 63 6c 61 72 65 2d | 76 61 72 69 61 62 6c 65 |declare-|variable|
|00003870| 20 27 65 64 69 66 66 2d | 6c 6f 61 64 2d 68 6f 6f | 'ediff-|load-hoo|
|00003880| 6b 20 27 6e 69 6c 20 22 | 2a 48 6f 6f 6b 20 72 75 |k 'nil "|*Hook ru|
|00003890| 6e 20 61 66 74 65 72 20 | 45 64 69 66 66 20 69 73 |n after |Ediff is|
|000038a0| 20 6c 6f 61 64 65 64 2e | 20 20 43 61 6e 20 62 65 | loaded.| Can be|
|000038b0| 20 75 73 65 64 20 74 6f | 20 63 68 61 6e 67 65 20 | used to| change |
|000038c0| 64 65 66 61 75 6c 74 73 | 2e 22 20 3a 74 79 70 65 |defaults|." :type|
|000038d0| 20 27 68 6f 6f 6b 20 3a | 67 72 6f 75 70 20 27 65 | 'hook :|group 'e|
|000038e0| 64 69 66 66 2d 68 6f 6f | 6b 29 0a 28 63 75 73 74 |diff-hoo|k).(cust|
|000038f0| 6f 6d 2d 64 65 63 6c 61 | 72 65 2d 76 61 72 69 61 |om-decla|re-varia|
|00003900| 62 6c 65 20 27 65 64 69 | 66 66 2d 6d 6f 64 65 2d |ble 'edi|ff-mode-|
|00003910| 68 6f 6f 6b 20 27 6e 69 | 6c 20 22 2a 48 6f 6f 6b |hook 'ni|l "*Hook|
|00003920| 20 72 75 6e 20 6a 75 73 | 74 20 61 66 74 65 72 20 | run jus|t after |
|00003930| 65 64 69 66 66 2d 6d 6f | 64 65 20 69 73 20 73 65 |ediff-mo|de is se|
|00003940| 74 20 75 70 20 69 6e 20 | 74 68 65 20 63 6f 6e 74 |t up in |the cont|
|00003950| 72 6f 6c 20 62 75 66 66 | 65 72 2e 20 5c 6e 54 68 |rol buff|er. \nTh|
|00003960| 69 73 20 69 73 20 64 6f | 6e 65 20 62 65 66 6f 72 |is is do|ne befor|
|00003970| 65 20 61 6e 79 20 77 69 | 6e 64 6f 77 73 20 6f 72 |e any wi|ndows or|
|00003980| 20 66 72 61 6d 65 73 20 | 61 72 65 20 63 72 65 61 | frames |are crea|
|00003990| 74 65 64 2e 20 4f 6e 65 | 20 63 61 6e 20 75 73 65 |ted. One| can use|
|000039a0| 20 69 74 20 74 6f 5c 6e | 73 65 74 20 6c 6f 63 61 | it to\n|set loca|
|000039b0| 6c 20 76 61 72 69 61 62 | 6c 65 73 20 74 68 61 74 |l variab|les that|
|000039c0| 20 64 65 74 65 72 6d 69 | 6e 65 20 68 6f 77 20 74 | determi|ne how t|
|000039d0| 68 65 20 64 69 73 70 6c | 61 79 20 6c 6f 6f 6b 73 |he displ|ay looks|
|000039e0| 20 6c 69 6b 65 2e 22 20 | 3a 74 79 70 65 20 27 68 | like." |:type 'h|
|000039f0| 6f 6f 6b 20 3a 67 72 6f | 75 70 20 27 65 64 69 66 |ook :gro|up 'edif|
|00003a00| 66 2d 68 6f 6f 6b 29 0a | 28 63 75 73 74 6f 6d 2d |f-hook).|(custom-|
|00003a10| 64 65 63 6c 61 72 65 2d | 76 61 72 69 61 62 6c 65 |declare-|variable|
|00003a20| 20 27 65 64 69 66 66 2d | 6b 65 79 6d 61 70 2d 73 | 'ediff-|keymap-s|
|00003a30| 65 74 75 70 2d 68 6f 6f | 6b 20 27 6e 69 6c 20 22 |etup-hoo|k 'nil "|
|00003a40| 2a 48 6f 6f 6b 20 72 75 | 6e 20 6a 75 73 74 20 61 |*Hook ru|n just a|
|00003a50| 66 74 65 72 20 74 68 65 | 20 64 65 66 61 75 6c 74 |fter the| default|
|00003a60| 20 62 69 6e 64 69 6e 67 | 73 20 69 6e 20 45 64 69 | binding|s in Edi|
|00003a70| 66 66 20 6b 65 79 6d 61 | 70 20 61 72 65 20 73 65 |ff keyma|p are se|
|00003a80| 74 20 75 70 2e 22 20 3a | 74 79 70 65 20 27 68 6f |t up." :|type 'ho|
|00003a90| 6f 6b 20 3a 67 72 6f 75 | 70 20 27 65 64 69 66 66 |ok :grou|p 'ediff|
|00003aa0| 2d 68 6f 6f 6b 29 0a 28 | 63 75 73 74 6f 6d 2d 64 |-hook).(|custom-d|
|00003ab0| 65 63 6c 61 72 65 2d 76 | 61 72 69 61 62 6c 65 20 |eclare-v|ariable |
|00003ac0| 27 65 64 69 66 66 2d 64 | 69 73 70 6c 61 79 2d 68 |'ediff-d|isplay-h|
|00003ad0| 65 6c 70 2d 68 6f 6f 6b | 20 27 6e 69 6c 20 22 2a |elp-hook| 'nil "*|
|00003ae0| 48 6f 6f 6b 73 20 72 75 | 6e 20 61 66 74 65 72 20 |Hooks ru|n after |
|00003af0| 70 72 65 70 61 72 69 6e | 67 20 74 68 65 20 68 65 |preparin|g the he|
|00003b00| 6c 70 20 6d 65 73 73 61 | 67 65 2e 22 20 3a 74 79 |lp messa|ge." :ty|
|00003b10| 70 65 20 27 68 6f 6f 6b | 20 3a 67 72 6f 75 70 20 |pe 'hook| :group |
|00003b20| 27 65 64 69 66 66 2d 68 | 6f 6f 6b 29 0a 28 63 75 |'ediff-h|ook).(cu|
|00003b30| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00003b40| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 73 75 73 |iable 'e|diff-sus|
|00003b50| 70 65 6e 64 2d 68 6f 6f | 6b 20 27 28 6c 69 73 74 |pend-hoo|k '(list|
|00003b60| 20 27 65 64 69 66 66 2d | 64 65 66 61 75 6c 74 2d | 'ediff-|default-|
|00003b70| 73 75 73 70 65 6e 64 2d | 66 75 6e 63 74 69 6f 6e |suspend-|function|
|00003b80| 29 20 22 2a 48 6f 6f 6b | 73 20 74 6f 20 72 75 6e |) "*Hook|s to run|
|00003b90| 20 69 6e 20 74 68 65 20 | 45 64 69 66 66 20 63 6f | in the |Ediff co|
|00003ba0| 6e 74 72 6f 6c 20 62 75 | 66 66 65 72 20 77 68 65 |ntrol bu|ffer whe|
|00003bb0| 6e 20 45 64 69 66 66 20 | 69 73 20 73 75 73 70 65 |n Ediff |is suspe|
|00003bc0| 6e 64 65 64 2e 22 20 3a | 74 79 70 65 20 27 68 6f |nded." :|type 'ho|
|00003bd0| 6f 6b 20 3a 67 72 6f 75 | 70 20 27 65 64 69 66 66 |ok :grou|p 'ediff|
|00003be0| 2d 68 6f 6f 6b 29 0a 28 | 63 75 73 74 6f 6d 2d 64 |-hook).(|custom-d|
|00003bf0| 65 63 6c 61 72 65 2d 76 | 61 72 69 61 62 6c 65 20 |eclare-v|ariable |
|00003c00| 27 65 64 69 66 66 2d 71 | 75 69 74 2d 68 6f 6f 6b |'ediff-q|uit-hook|
|00003c10| 20 27 28 6c 69 73 74 20 | 27 65 64 69 66 66 2d 63 | '(list |'ediff-c|
|00003c20| 6c 65 61 6e 75 70 2d 6d | 65 73 73 29 20 22 2a 48 |leanup-m|ess) "*H|
|00003c30| 6f 6f 6b 73 20 74 6f 20 | 72 75 6e 20 69 6e 20 74 |ooks to |run in t|
|00003c40| 68 65 20 45 64 69 66 66 | 20 63 6f 6e 74 72 6f 6c |he Ediff| control|
|00003c50| 20 62 75 66 66 65 72 20 | 61 66 74 65 72 20 66 69 | buffer |after fi|
|00003c60| 6e 69 73 68 69 6e 67 20 | 45 64 69 66 66 2e 22 20 |nishing |Ediff." |
|00003c70| 3a 74 79 70 65 20 27 68 | 6f 6f 6b 20 3a 67 72 6f |:type 'h|ook :gro|
|00003c80| 75 70 20 27 65 64 69 66 | 66 2d 68 6f 6f 6b 29 0a |up 'edif|f-hook).|
|00003c90| 28 63 75 73 74 6f 6d 2d | 64 65 63 6c 61 72 65 2d |(custom-|declare-|
|00003ca0| 76 61 72 69 61 62 6c 65 | 20 27 65 64 69 66 66 2d |variable| 'ediff-|
|00003cb0| 63 6c 65 61 6e 75 70 2d | 68 6f 6f 6b 20 27 6e 69 |cleanup-|hook 'ni|
|00003cc0| 6c 20 22 2a 48 6f 6f 6b | 73 20 74 6f 20 72 75 6e |l "*Hook|s to run|
|00003cd0| 20 6f 6e 20 65 78 69 74 | 69 6e 67 20 45 64 69 66 | on exit|ing Edif|
|00003ce0| 66 20 62 75 74 20 62 65 | 66 6f 72 65 20 6b 69 6c |f but be|fore kil|
|00003cf0| 6c 69 6e 67 20 74 68 65 | 20 63 6f 6e 74 72 6f 6c |ling the| control|
|00003d00| 20 62 75 66 66 65 72 2e | 5c 6e 54 68 69 73 20 69 | buffer.|\nThis i|
|00003d10| 73 20 61 20 70 6c 61 63 | 65 20 74 6f 20 64 6f 20 |s a plac|e to do |
|00003d20| 76 61 72 69 6f 75 73 20 | 63 6c 65 61 6e 75 70 73 |various |cleanups|
|00003d30| 2c 20 73 75 63 68 20 61 | 73 20 64 65 6c 65 74 69 |, such a|s deleti|
|00003d40| 6e 67 20 74 68 65 20 76 | 61 72 69 61 6e 74 20 62 |ng the v|ariant b|
|00003d50| 75 66 66 65 72 73 2e 5c | 6e 45 64 69 66 66 20 70 |uffers.\|nEdiff p|
|00003d60| 72 6f 76 69 64 65 73 20 | 61 20 66 75 6e 63 74 69 |rovides |a functi|
|00003d70| 6f 6e 2c 20 60 65 64 69 | 66 66 2d 6a 61 6e 69 74 |on, `edi|ff-janit|
|00003d80| 6f 72 27 2c 20 61 73 20 | 6f 6e 65 20 73 75 63 68 |or', as |one such|
|00003d90| 20 70 6f 73 73 69 62 6c | 65 20 68 6f 6f 6b 2e 22 | possibl|e hook."|
|00003da0| 20 3a 74 79 70 65 20 27 | 68 6f 6f 6b 20 3a 67 72 | :type '|hook :gr|
|00003db0| 6f 75 70 20 27 65 64 69 | 66 66 2d 68 6f 6f 6b 29 |oup 'edi|ff-hook)|
|00003dc0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 11 c1 |.(byte-c|ode "...|
|00003dd0| 5c 6e 42 12 c3 14 c4 5c | 6e 42 12 c5 16 06 c6 5c |\nB....\|nB.....\|
|00003de0| 6e 42 12 c7 c8 0e 09 ab | 83 ca aa 81 cb 5c 22 16 |nB......|.....\".|
|00003df0| 0c cc 5c 6e 42 12 c1 87 | 22 20 5b 22 59 6f 75 20 |..\nB...|" ["You |
|00003e00| 68 61 76 65 20 6b 69 6c | 6c 65 64 20 61 20 76 69 |have kil|led a vi|
|00003e10| 74 61 6c 20 45 64 69 66 | 66 20 62 75 66 66 65 72 |tal Edif|f buffer|
|00003e20| 2d 2d 2d 79 6f 75 20 6d | 75 73 74 20 6c 65 61 76 |---you m|ust leav|
|00003e30| 65 20 45 64 69 66 66 20 | 6e 6f 77 21 22 20 65 64 |e Ediff |now!" ed|
|00003e40| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|00003e50| 2d 42 55 46 46 45 52 20 | 63 75 72 72 65 6e 74 2d |-BUFFER |current-|
|00003e60| 6c 6f 61 64 2d 6c 69 73 | 74 20 22 53 6f 72 72 79 |load-lis|t "Sorry|
|00003e70| 2c 20 63 6f 6d 70 61 72 | 69 73 6f 6e 20 6f 66 20 |, compar|ison of |
|00003e80| 69 64 65 6e 74 69 63 61 | 6c 20 76 61 72 69 61 6e |identica|l varian|
|00003e90| 74 73 20 69 73 20 6e 6f | 74 20 77 68 61 74 20 49 |ts is no|t what I|
|00003ea0| 20 61 6d 20 6d 61 64 65 | 20 66 6f 72 2e 2e 2e 22 | am made| for..."|
|00003eb0| 20 65 64 69 66 66 2d 4e | 4f 2d 44 49 46 46 45 52 | ediff-N|O-DIFFER|
|00003ec0| 45 4e 43 45 53 20 22 25 | 53 3a 20 42 61 64 20 64 |ENCES "%|S: Bad d|
|00003ed0| 69 66 66 20 72 65 67 69 | 6f 6e 20 6e 75 6d 62 65 |iff regi|on numbe|
|00003ee0| 72 2c 20 25 64 2e 20 56 | 61 6c 69 64 20 6e 75 6d |r, %d. V|alid num|
|00003ef0| 62 65 72 73 20 61 72 65 | 20 31 20 74 6f 20 25 64 |bers are| 1 to %d|
|00003f00| 22 20 65 64 69 66 66 2d | 42 41 44 2d 44 49 46 46 |" ediff-|BAD-DIFF|
|00003f10| 2d 4e 55 4d 42 45 52 20 | 66 6f 72 6d 61 74 20 22 |-NUMBER |format "|
|00003f20| 5c 6e 2a 2a 2a 20 54 68 | 65 20 49 6e 66 6f 20 66 |\n*** Th|e Info f|
|00003f30| 69 6c 65 20 66 6f 72 20 | 45 64 69 66 66 2c 20 61 |ile for |Ediff, a|
|00003f40| 20 70 61 72 74 20 6f 66 | 20 74 68 65 20 73 74 61 | part of| the sta|
|00003f50| 6e 64 61 72 64 20 64 69 | 73 74 72 69 62 75 74 69 |ndard di|stributi|
|00003f60| 6f 6e 5c 6e 2a 2a 2a 20 | 6f 66 20 25 73 45 6d 61 |on\n*** |of %sEma|
|00003f70| 63 73 2c 20 64 6f 65 73 | 20 6e 6f 74 20 73 65 65 |cs, does| not see|
|00003f80| 6d 20 74 6f 20 62 65 20 | 70 72 6f 70 65 72 6c 79 |m to be |properly|
|00003f90| 20 69 6e 73 74 61 6c 6c | 65 64 2e 5c 6e 2a 2a 2a | install|ed.\n***|
|00003fa0| 20 5c 6e 2a 2a 2a 20 50 | 6c 65 61 73 65 20 63 6f | \n*** P|lease co|
|00003fb0| 6e 74 61 63 74 20 79 6f | 75 72 20 73 79 73 74 65 |ntact yo|ur syste|
|00003fc0| 6d 20 61 64 6d 69 6e 69 | 73 74 72 61 74 6f 72 2e |m admini|strator.|
|00003fd0| 20 22 20 65 64 69 66 66 | 2d 78 65 6d 61 63 73 2d | " ediff|-xemacs-|
|00003fe0| 70 20 22 58 22 20 22 22 | 20 65 64 69 66 66 2d 42 |p "X" ""| ediff-B|
|00003ff0| 41 44 2d 49 4e 46 4f 5d | 20 33 29 0a 23 40 32 37 |AD-INFO]| 3).#@27|
|00004000| 39 20 46 75 6e 63 74 69 | 6f 6e 20 74 68 61 74 20 |9 Functi|on that |
|00004010| 64 65 74 65 72 6d 69 6e | 65 73 20 74 68 65 20 6e |determin|es the n|
|00004020| 65 78 74 2f 70 72 65 76 | 69 6f 75 73 20 64 69 66 |ext/prev|ious dif|
|00004030| 66 20 72 65 67 69 6f 6e | 20 74 6f 20 73 68 6f 77 |f region| to show|
|00004040| 2e 0a 53 68 6f 75 6c 64 | 20 72 65 74 75 72 6e 20 |..Should| return |
|00004050| 74 20 66 6f 72 20 72 65 | 67 69 6f 6e 73 20 74 6f |t for re|gions to|
|00004060| 20 62 65 20 69 67 6e 6f | 72 65 64 20 61 6e 64 20 | be igno|red and |
|00004070| 6e 69 6c 20 6f 74 68 65 | 72 77 69 73 65 2e 0a 54 |nil othe|rwise..T|
|00004080| 68 69 73 20 66 75 6e 63 | 74 69 6f 6e 20 67 65 74 |his func|tion get|
|00004090| 73 20 61 20 72 65 67 69 | 6f 6e 20 6e 75 6d 62 65 |s a regi|on numbe|
|000040a0| 72 20 61 73 20 61 6e 20 | 61 72 67 75 6d 65 6e 74 |r as an |argument|
|000040b0| 2e 20 54 68 65 20 72 65 | 67 69 6f 6e 20 6e 75 6d |. The re|gion num|
|000040c0| 62 65 72 0a 69 73 20 74 | 68 65 20 6f 6e 65 20 75 |ber.is t|he one u|
|000040d0| 73 65 64 20 69 6e 74 65 | 72 6e 61 6c 6c 79 20 62 |sed inte|rnally b|
|000040e0| 79 20 45 64 69 66 66 2e | 20 49 74 20 69 73 20 31 |y Ediff.| It is 1|
|000040f0| 20 6c 65 73 73 20 74 68 | 61 6e 20 74 68 65 20 6e | less th|an the n|
|00004100| 75 6d 62 65 72 20 73 65 | 65 6e 0a 62 79 20 74 68 |umber se|en.by th|
|00004110| 65 20 75 73 65 72 2e 1f | 0a 28 64 65 66 76 61 72 |e user..|.(defvar|
|00004120| 20 65 64 69 66 66 2d 73 | 6b 69 70 2d 64 69 66 66 | ediff-s|kip-diff|
|00004130| 2d 72 65 67 69 6f 6e 2d | 66 75 6e 63 74 69 6f 6e |-region-|function|
|00004140| 20 27 65 64 69 66 66 2d | 73 68 6f 77 2d 61 6c 6c | 'ediff-|show-all|
|00004150| 2d 64 69 66 66 73 20 28 | 23 24 20 2e 20 31 36 33 |-diffs (|#$ . 163|
|00004160| 38 36 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |86)).(by|te-code |
|00004170| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00004180| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004190| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 73 |er-local| ediff-s|
|000041a0| 6b 69 70 2d 64 69 66 66 | 2d 72 65 67 69 6f 6e 2d |kip-diff|-region-|
|000041b0| 66 75 6e 63 74 69 6f 6e | 20 70 75 74 20 70 65 72 |function| put per|
|000041c0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|000041d0| 34 29 0a 23 40 31 32 38 | 20 46 75 6e 63 74 69 6f |4).#@128| Functio|
|000041e0| 6e 20 74 6f 20 75 73 65 | 20 69 6e 20 64 65 74 65 |n to use| in dete|
|000041f0| 72 6d 69 6e 69 6e 67 20 | 77 68 69 63 68 20 72 65 |rmining |which re|
|00004200| 67 69 6f 6e 73 20 74 6f | 20 68 69 64 65 2e 0a 53 |gions to| hide..S|
|00004210| 65 65 20 74 68 65 20 64 | 6f 63 75 6d 65 6e 74 61 |ee the d|ocumenta|
|00004220| 74 69 6f 6e 20 73 74 72 | 69 6e 67 20 6f 66 20 60 |tion str|ing of `|
|00004230| 65 64 69 66 66 2d 68 69 | 64 65 2d 72 65 67 65 78 |ediff-hi|de-regex|
|00004240| 70 2d 6d 61 74 63 68 65 | 73 27 20 66 6f 72 20 64 |p-matche|s' for d|
|00004250| 65 74 61 69 6c 73 2e 1f | 0a 28 64 65 66 76 61 72 |etails..|.(defvar|
|00004260| 20 65 64 69 66 66 2d 68 | 69 64 65 2d 72 65 67 65 | ediff-h|ide-rege|
|00004270| 78 70 2d 6d 61 74 63 68 | 65 73 2d 66 75 6e 63 74 |xp-match|es-funct|
|00004280| 69 6f 6e 20 27 65 64 69 | 66 66 2d 68 69 64 65 2d |ion 'edi|ff-hide-|
|00004290| 72 65 67 65 78 70 2d 6d | 61 74 63 68 65 73 20 28 |regexp-m|atches (|
|000042a0| 23 24 20 2e 20 31 36 38 | 35 37 29 29 0a 28 62 79 |#$ . 168|57)).(by|
|000042b0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|000042c0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|000042d0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|000042e0| 20 65 64 69 66 66 2d 68 | 69 64 65 2d 72 65 67 65 | ediff-h|ide-rege|
|000042f0| 78 70 2d 6d 61 74 63 68 | 65 73 2d 66 75 6e 63 74 |xp-match|es-funct|
|00004300| 69 6f 6e 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ion put |permanen|
|00004310| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00004320| 31 33 36 20 46 75 6e 63 | 74 69 6f 6e 20 74 6f 20 |136 Func|tion to |
|00004330| 75 73 65 20 69 6e 20 64 | 65 74 65 72 6d 69 6e 69 |use in d|etermini|
|00004340| 6e 67 20 77 68 69 63 68 | 20 72 65 67 69 6f 6e 73 |ng which| regions|
|00004350| 20 74 6f 20 66 6f 63 75 | 73 20 6f 6e 2e 0a 53 65 | to focu|s on..Se|
|00004360| 65 20 74 68 65 20 64 6f | 63 75 6d 65 6e 74 61 74 |e the do|cumentat|
|00004370| 69 6f 6e 20 73 74 72 69 | 6e 67 20 6f 66 20 60 65 |ion stri|ng of `e|
|00004380| 64 69 66 66 2d 66 6f 63 | 75 73 2d 6f 6e 2d 72 65 |diff-foc|us-on-re|
|00004390| 67 65 78 70 2d 6d 61 74 | 63 68 65 73 27 20 66 6f |gexp-mat|ches' fo|
|000043a0| 72 20 64 65 74 61 69 6c | 73 2e 1f 0a 28 64 65 66 |r detail|s...(def|
|000043b0| 76 61 72 20 65 64 69 66 | 66 2d 66 6f 63 75 73 2d |var edif|f-focus-|
|000043c0| 6f 6e 2d 72 65 67 65 78 | 70 2d 6d 61 74 63 68 65 |on-regex|p-matche|
|000043d0| 73 2d 66 75 6e 63 74 69 | 6f 6e 20 27 65 64 69 66 |s-functi|on 'edif|
|000043e0| 66 2d 66 6f 63 75 73 2d | 6f 6e 2d 72 65 67 65 78 |f-focus-|on-regex|
|000043f0| 70 2d 6d 61 74 63 68 65 | 73 20 28 23 24 20 2e 20 |p-matche|s (#$ . |
|00004400| 31 37 31 38 38 29 29 0a | 28 62 79 74 65 2d 63 6f |17188)).|(byte-co|
|00004410| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00004420| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00004430| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00004440| 66 2d 66 6f 63 75 73 2d | 6f 6e 2d 72 65 67 65 78 |f-focus-|on-regex|
|00004450| 70 2d 6d 61 74 63 68 65 | 73 2d 66 75 6e 63 74 69 |p-matche|s-functi|
|00004460| 6f 6e 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |on put p|ermanent|
|00004470| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 32 |-local t|] 4).#@2|
|00004480| 20 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 | ..(defv|ar ediff|
|00004490| 2d 72 65 67 65 78 70 2d | 66 6f 63 75 73 2d 41 20 |-regexp-|focus-A |
|000044a0| 22 22 20 28 23 24 20 2e | 20 31 37 35 33 37 29 29 |"" (#$ .| 17537))|
|000044b0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000044c0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000044d0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000044e0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 72 65 67 65 78 |ocal edi|ff-regex|
|000044f0| 70 2d 66 6f 63 75 73 2d | 41 20 70 75 74 20 70 65 |p-focus-|A put pe|
|00004500| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00004510| 20 34 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 | 4).#@2 |..(defva|
|00004520| 72 20 65 64 69 66 66 2d | 72 65 67 65 78 70 2d 66 |r ediff-|regexp-f|
|00004530| 6f 63 75 73 2d 42 20 22 | 22 20 28 23 24 20 2e 20 |ocus-B "|" (#$ . |
|00004540| 31 37 36 38 38 29 29 0a | 28 62 79 74 65 2d 63 6f |17688)).|(byte-co|
|00004550| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00004560| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00004570| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00004580| 66 2d 72 65 67 65 78 70 | 2d 66 6f 63 75 73 2d 42 |f-regexp|-focus-B|
|00004590| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|000045a0| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 20 1f |ocal t] |4).#@2 .|
|000045b0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 72 |.(defvar| ediff-r|
|000045c0| 65 67 65 78 70 2d 66 6f | 63 75 73 2d 43 20 22 22 |egexp-fo|cus-C ""|
|000045d0| 20 28 23 24 20 2e 20 31 | 37 38 33 39 29 29 0a 28 | (#$ . 1|7839)).(|
|000045e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000045f0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00004600| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00004610| 61 6c 20 65 64 69 66 66 | 2d 72 65 67 65 78 70 2d |al ediff|-regexp-|
|00004620| 66 6f 63 75 73 2d 43 20 | 70 75 74 20 70 65 72 6d |focus-C |put perm|
|00004630| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00004640| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00004650| 65 64 69 66 66 2d 66 6f | 63 75 73 2d 72 65 67 65 |ediff-fo|cus-rege|
|00004660| 78 70 2d 63 6f 6e 6e 65 | 63 74 69 76 65 20 27 61 |xp-conne|ctive 'a|
|00004670| 6e 64 20 28 23 24 20 2e | 20 31 37 39 39 30 29 29 |nd (#$ .| 17990))|
|00004680| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00004690| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000046a0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000046b0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 66 6f 63 75 73 |ocal edi|ff-focus|
|000046c0| 2d 72 65 67 65 78 70 2d | 63 6f 6e 6e 65 63 74 69 |-regexp-|connecti|
|000046d0| 76 65 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ve put p|ermanent|
|000046e0| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 32 |-local t|] 4).#@2|
|000046f0| 20 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 | ..(defv|ar ediff|
|00004700| 2d 72 65 67 65 78 70 2d | 68 69 64 65 2d 41 20 22 |-regexp-|hide-A "|
|00004710| 22 20 28 23 24 20 2e 20 | 31 38 31 36 31 29 29 0a |" (#$ . |18161)).|
|00004720| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004730| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004740| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004750| 63 61 6c 20 65 64 69 66 | 66 2d 72 65 67 65 78 70 |cal edif|f-regexp|
|00004760| 2d 68 69 64 65 2d 41 20 | 70 75 74 20 70 65 72 6d |-hide-A |put perm|
|00004770| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00004780| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00004790| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 68 69 64 |ediff-re|gexp-hid|
|000047a0| 65 2d 42 20 22 22 20 28 | 23 24 20 2e 20 31 38 33 |e-B "" (|#$ . 183|
|000047b0| 31 30 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |10)).(by|te-code |
|000047c0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000047d0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000047e0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 72 |er-local| ediff-r|
|000047f0| 65 67 65 78 70 2d 68 69 | 64 65 2d 42 20 70 75 74 |egexp-hi|de-B put|
|00004800| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00004810| 20 74 5d 20 34 29 0a 23 | 40 32 20 1f 0a 28 64 65 | t] 4).#|@2 ..(de|
|00004820| 66 76 61 72 20 65 64 69 | 66 66 2d 72 65 67 65 78 |fvar edi|ff-regex|
|00004830| 70 2d 68 69 64 65 2d 43 | 20 22 22 20 28 23 24 20 |p-hide-C| "" (#$ |
|00004840| 2e 20 31 38 34 35 39 29 | 29 0a 28 62 79 74 65 2d |. 18459)|).(byte-|
|00004850| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00004860| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00004870| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00004880| 69 66 66 2d 72 65 67 65 | 78 70 2d 68 69 64 65 2d |iff-rege|xp-hide-|
|00004890| 43 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |C put pe|rmanent-|
|000048a0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|000048b0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000048c0| 68 69 64 65 2d 72 65 67 | 65 78 70 2d 63 6f 6e 6e |hide-reg|exp-conn|
|000048d0| 65 63 74 69 76 65 20 27 | 61 6e 64 20 28 23 24 20 |ective '|and (#$ |
|000048e0| 2e 20 31 38 36 30 38 29 | 29 0a 28 62 79 74 65 2d |. 18608)|).(byte-|
|000048f0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00004900| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00004910| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00004920| 69 66 66 2d 68 69 64 65 | 2d 72 65 67 65 78 70 2d |iff-hide|-regexp-|
|00004930| 63 6f 6e 6e 65 63 74 69 | 76 65 20 70 75 74 20 70 |connecti|ve put p|
|00004940| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00004950| 5d 20 34 29 0a 23 40 32 | 20 1f 0a 28 64 65 66 76 |] 4).#@2| ..(defv|
|00004960| 61 72 20 65 64 69 66 66 | 2d 6b 69 6c 6c 65 64 2d |ar ediff|-killed-|
|00004970| 64 69 66 66 73 2d 61 6c | 69 73 74 20 6e 69 6c 20 |diffs-al|ist nil |
|00004980| 28 23 24 20 2e 20 31 38 | 37 37 37 29 29 0a 28 62 |(#$ . 18|777)).(b|
|00004990| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000049a0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000049b0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000049c0| 6c 20 65 64 69 66 66 2d | 6b 69 6c 6c 65 64 2d 64 |l ediff-|killed-d|
|000049d0| 69 66 66 73 2d 61 6c 69 | 73 74 20 70 75 74 20 70 |iffs-ali|st put p|
|000049e0| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|000049f0| 5d 20 34 29 0a 28 63 75 | 73 74 6f 6d 2d 64 65 63 |] 4).(cu|stom-dec|
|00004a00| 6c 61 72 65 2d 76 61 72 | 69 61 62 6c 65 20 27 65 |lare-var|iable 'e|
|00004a10| 64 69 66 66 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |diff-bef|ore-flag|
|00004a20| 2d 62 6f 6c 20 27 28 69 | 66 20 65 64 69 66 66 2d |-bol '(i|f ediff-|
|00004a30| 78 65 6d 61 63 73 2d 70 | 20 28 6d 61 6b 65 2d 67 |xemacs-p| (make-g|
|00004a40| 6c 79 70 68 20 22 2d 3e | 3e 22 29 20 22 2d 3e 3e |lyph "->|>") "->>|
|00004a50| 22 29 20 22 2a 46 6c 61 | 67 20 70 6c 61 63 65 64 |") "*Fla|g placed|
|00004a60| 20 62 65 66 6f 72 65 20 | 61 20 68 69 67 68 6c 69 | before |a highli|
|00004a70| 67 68 74 65 64 20 62 6c | 6f 63 6b 20 6f 66 20 64 |ghted bl|ock of d|
|00004a80| 69 66 66 65 72 65 6e 63 | 65 73 2c 20 69 66 20 62 |ifferenc|es, if b|
|00004a90| 6c 6f 63 6b 20 73 74 61 | 72 74 73 20 61 74 20 62 |lock sta|rts at b|
|00004aa0| 65 67 69 6e 6e 69 6e 67 | 20 6f 66 20 61 20 6c 69 |eginning| of a li|
|00004ab0| 6e 65 2e 22 20 3a 74 79 | 70 65 20 27 73 74 72 69 |ne." :ty|pe 'stri|
|00004ac0| 6e 67 20 3a 74 61 67 20 | 22 52 65 67 69 6f 6e 20 |ng :tag |"Region |
|00004ad0| 62 65 66 6f 72 65 2d 66 | 6c 61 67 20 61 74 20 62 |before-f|lag at b|
|00004ae0| 65 67 69 6e 6e 69 6e 67 | 20 6f 66 20 6c 69 6e 65 |eginning| of line|
|00004af0| 22 20 3a 67 72 6f 75 70 | 20 27 65 64 69 66 66 29 |" :group| 'ediff)|
|00004b00| 0a 28 63 75 73 74 6f 6d | 2d 64 65 63 6c 61 72 65 |.(custom|-declare|
|00004b10| 2d 76 61 72 69 61 62 6c | 65 20 27 65 64 69 66 66 |-variabl|e 'ediff|
|00004b20| 2d 61 66 74 65 72 2d 66 | 6c 61 67 2d 65 6f 6c 20 |-after-f|lag-eol |
|00004b30| 27 28 69 66 20 65 64 69 | 66 66 2d 78 65 6d 61 63 |'(if edi|ff-xemac|
|00004b40| 73 2d 70 20 28 6d 61 6b | 65 2d 67 6c 79 70 68 20 |s-p (mak|e-glyph |
|00004b50| 22 3c 3c 2d 22 29 20 22 | 3c 3c 2d 22 29 20 22 2a |"<<-") "|<<-") "*|
|00004b60| 46 6c 61 67 20 70 6c 61 | 63 65 64 20 61 66 74 65 |Flag pla|ced afte|
|00004b70| 72 20 61 20 68 69 67 68 | 6c 69 67 68 74 65 64 20 |r a high|lighted |
|00004b80| 62 6c 6f 63 6b 20 6f 66 | 20 64 69 66 66 65 72 65 |block of| differe|
|00004b90| 6e 63 65 73 2c 20 69 66 | 20 62 6c 6f 63 6b 20 65 |nces, if| block e|
|00004ba0| 6e 64 73 20 61 74 20 65 | 6e 64 20 6f 66 20 61 20 |nds at e|nd of a |
|00004bb0| 6c 69 6e 65 2e 22 20 3a | 74 79 70 65 20 27 73 74 |line." :|type 'st|
|00004bc0| 72 69 6e 67 20 3a 74 61 | 67 20 22 52 65 67 69 6f |ring :ta|g "Regio|
|00004bd0| 6e 20 61 66 74 65 72 2d | 66 6c 61 67 20 61 74 20 |n after-|flag at |
|00004be0| 65 6e 64 20 6f 66 20 6c | 69 6e 65 22 20 3a 67 72 |end of l|ine" :gr|
|00004bf0| 6f 75 70 20 27 65 64 69 | 66 66 29 0a 28 63 75 73 |oup 'edi|ff).(cus|
|00004c00| 74 6f 6d 2d 64 65 63 6c | 61 72 65 2d 76 61 72 69 |tom-decl|are-vari|
|00004c10| 61 62 6c 65 20 27 65 64 | 69 66 66 2d 62 65 66 6f |able 'ed|iff-befo|
|00004c20| 72 65 2d 66 6c 61 67 2d | 6d 6f 6c 20 27 28 69 66 |re-flag-|mol '(if|
|00004c30| 20 65 64 69 66 66 2d 78 | 65 6d 61 63 73 2d 70 20 | ediff-x|emacs-p |
|00004c40| 28 6d 61 6b 65 2d 67 6c | 79 70 68 20 22 2d 3e 3e |(make-gl|yph "->>|
|00004c50| 22 29 20 22 2d 3e 3e 22 | 29 20 22 2a 46 6c 61 67 |") "->>"|) "*Flag|
|00004c60| 20 70 6c 61 63 65 64 20 | 62 65 66 6f 72 65 20 61 | placed |before a|
|00004c70| 20 68 69 67 68 6c 69 67 | 68 74 65 64 20 62 6c 6f | highlig|hted blo|
|00004c80| 63 6b 20 6f 66 20 64 69 | 66 66 65 72 65 6e 63 65 |ck of di|fference|
|00004c90| 73 2c 20 69 66 20 62 6c | 6f 63 6b 20 73 74 61 72 |s, if bl|ock star|
|00004ca0| 74 73 20 69 6e 20 6d 69 | 64 2d 6c 69 6e 65 2e 22 |ts in mi|d-line."|
|00004cb0| 20 3a 74 79 70 65 20 27 | 73 74 72 69 6e 67 20 3a | :type '|string :|
|00004cc0| 74 61 67 20 22 52 65 67 | 69 6f 6e 20 62 65 66 6f |tag "Reg|ion befo|
|00004cd0| 72 65 2d 66 6c 61 67 20 | 69 6e 20 74 68 65 20 6d |re-flag |in the m|
|00004ce0| 69 64 64 6c 65 20 6f 66 | 20 6c 69 6e 65 22 20 3a |iddle of| line" :|
|00004cf0| 67 72 6f 75 70 20 27 65 | 64 69 66 66 29 0a 28 63 |group 'e|diff).(c|
|00004d00| 75 73 74 6f 6d 2d 64 65 | 63 6c 61 72 65 2d 76 61 |ustom-de|clare-va|
|00004d10| 72 69 61 62 6c 65 20 27 | 65 64 69 66 66 2d 61 66 |riable '|ediff-af|
|00004d20| 74 65 72 2d 66 6c 61 67 | 2d 6d 6f 6c 20 27 28 69 |ter-flag|-mol '(i|
|00004d30| 66 20 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 |f ediff-|xemacs-p|
|00004d40| 20 28 6d 61 6b 65 2d 67 | 6c 79 70 68 20 22 3c 3c | (make-g|lyph "<<|
|00004d50| 2d 22 29 20 22 3c 3c 2d | 22 29 20 22 2a 46 6c 61 |-") "<<-|") "*Fla|
|00004d60| 67 20 70 6c 61 63 65 64 | 20 61 66 74 65 72 20 61 |g placed| after a|
|00004d70| 20 68 69 67 68 6c 69 67 | 68 74 65 64 20 62 6c 6f | highlig|hted blo|
|00004d80| 63 6b 20 6f 66 20 64 69 | 66 66 65 72 65 6e 63 65 |ck of di|fference|
|00004d90| 73 2c 20 69 66 20 62 6c | 6f 63 6b 20 65 6e 64 73 |s, if bl|ock ends|
|00004da0| 20 69 6e 20 6d 69 64 2d | 6c 69 6e 65 2e 22 20 3a | in mid-|line." :|
|00004db0| 74 79 70 65 20 27 73 74 | 72 69 6e 67 20 3a 74 61 |type 'st|ring :ta|
|00004dc0| 67 20 22 52 65 67 69 6f | 6e 20 61 66 74 65 72 2d |g "Regio|n after-|
|00004dd0| 66 6c 61 67 20 69 6e 20 | 74 68 65 20 6d 69 64 64 |flag in |the midd|
|00004de0| 6c 65 20 6f 66 20 6c 69 | 6e 65 22 20 3a 67 72 6f |le of li|ne" :gro|
|00004df0| 75 70 20 27 65 64 69 66 | 66 29 0a 23 40 33 35 39 |up 'edif|f).#@359|
|00004e00| 20 49 66 20 74 2c 20 64 | 69 66 66 65 72 65 6e 63 | If t, d|ifferenc|
|00004e10| 65 73 20 61 72 65 20 68 | 69 67 68 6c 69 67 68 74 |es are h|ighlight|
|00004e20| 65 64 20 75 73 69 6e 67 | 20 66 61 63 65 73 2c 20 |ed using| faces, |
|00004e30| 69 66 20 64 65 76 69 63 | 65 20 73 75 70 70 6f 72 |if devic|e suppor|
|00004e40| 74 73 20 66 61 63 65 73 | 2e 0a 49 66 20 6e 69 6c |ts faces|..If nil|
|00004e50| 2c 20 64 69 66 66 65 72 | 65 6e 63 65 73 20 61 72 |, differ|ences ar|
|00004e60| 65 20 68 69 67 68 6c 69 | 67 68 74 65 64 20 75 73 |e highli|ghted us|
|00004e70| 69 6e 67 20 41 53 43 49 | 49 20 66 6c 61 67 73 2c |ing ASCI|I flags,|
|00004e80| 20 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c | ediff-b|efore-fl|
|00004e90| 61 67 0a 61 6e 64 20 65 | 64 69 66 66 2d 61 66 74 |ag.and e|diff-aft|
|00004ea0| 65 72 2d 66 6c 61 67 2e | 20 20 4f 6e 20 61 20 6e |er-flag.| On a n|
|00004eb0| 6f 6e 2d 77 69 6e 64 6f | 77 20 73 79 73 74 65 6d |on-windo|w system|
|00004ec0| 2c 20 64 69 66 66 65 72 | 65 6e 63 65 73 20 61 72 |, differ|ences ar|
|00004ed0| 65 20 61 6c 77 61 79 73 | 0a 68 69 67 68 6c 69 67 |e always|.highlig|
|00004ee0| 68 74 65 64 20 75 73 69 | 6e 67 20 41 53 43 49 49 |hted usi|ng ASCII|
|00004ef0| 20 66 6c 61 67 73 2e 0a | 54 68 69 73 20 76 61 72 | flags..|This var|
|00004f00| 69 61 62 6c 65 20 63 61 | 6e 20 62 65 20 73 65 74 |iable ca|n be set|
|00004f10| 20 65 69 74 68 65 72 20 | 69 6e 20 2e 65 6d 61 63 | either |in .emac|
|00004f20| 73 20 6f 72 20 74 6f 67 | 67 6c 65 64 20 69 6e 74 |s or tog|gled int|
|00004f30| 65 72 61 63 74 69 76 65 | 6c 79 2e 0a 55 73 65 20 |eractive|ly..Use |
|00004f40| 60 73 65 74 71 2d 64 65 | 66 61 75 6c 74 27 20 69 |`setq-de|fault' i|
|00004f50| 66 20 73 65 74 74 69 6e | 67 20 69 74 20 69 6e 20 |f settin|g it in |
|00004f60| 2e 65 6d 61 63 73 1f 0a | 28 64 65 66 76 61 72 20 |.emacs..|(defvar |
|00004f70| 65 64 69 66 66 2d 75 73 | 65 2d 66 61 63 65 73 20 |ediff-us|e-faces |
|00004f80| 74 20 28 23 24 20 2e 20 | 31 39 39 36 39 29 29 0a |t (#$ . |19969)).|
|00004f90| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004fa0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004fb0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004fc0| 63 61 6c 20 65 64 69 66 | 66 2d 75 73 65 2d 66 61 |cal edif|f-use-fa|
|00004fd0| 63 65 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ces put |permanen|
|00004fe0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00004ff0| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00005000| 66 2d 77 6f 72 64 2d 6d | 6f 64 65 20 6e 69 6c 20 |f-word-m|ode nil |
|00005010| 28 23 24 20 2e 20 32 30 | 34 36 36 29 29 0a 28 62 |(#$ . 20|466)).(b|
|00005020| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00005030| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00005040| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00005050| 6c 20 65 64 69 66 66 2d | 77 6f 72 64 2d 6d 6f 64 |l ediff-|word-mod|
|00005060| 65 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |e put pe|rmanent-|
|00005070| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|00005080| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00005090| 6a 6f 62 2d 6e 61 6d 65 | 20 6e 69 6c 20 28 23 24 |job-name| nil (#$|
|000050a0| 20 2e 20 32 30 36 30 38 | 29 29 0a 28 62 79 74 65 | . 20608|)).(byte|
|000050b0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000050c0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000050d0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000050e0| 64 69 66 66 2d 6a 6f 62 | 2d 6e 61 6d 65 20 70 75 |diff-job|-name pu|
|000050f0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005100| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005110| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6e 61 72 72 |efvar ed|iff-narr|
|00005120| 6f 77 2d 62 6f 75 6e 64 | 73 20 6e 69 6c 20 28 23 |ow-bound|s nil (#|
|00005130| 24 20 2e 20 32 30 37 34 | 38 29 29 0a 28 62 79 74 |$ . 2074|8)).(byt|
|00005140| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005150| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00005160| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00005170| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 62 6f 75 |ediff-na|rrow-bou|
|00005180| 6e 64 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |nds put |permanen|
|00005190| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|000051a0| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|000051b0| 66 2d 77 69 64 65 2d 62 | 6f 75 6e 64 73 20 6e 69 |f-wide-b|ounds ni|
|000051c0| 6c 20 28 23 24 20 2e 20 | 32 30 38 39 38 29 29 0a |l (#$ . |20898)).|
|000051d0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000051e0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000051f0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00005200| 63 61 6c 20 65 64 69 66 | 66 2d 77 69 64 65 2d 62 |cal edif|f-wide-b|
|00005210| 6f 75 6e 64 73 20 70 75 | 74 20 70 65 72 6d 61 6e |ounds pu|t perman|
|00005220| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00005230| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00005240| 69 66 66 2d 76 69 73 69 | 62 6c 65 2d 62 6f 75 6e |iff-visi|ble-boun|
|00005250| 64 73 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 31 30 |ds nil (|#$ . 210|
|00005260| 34 34 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |44)).(by|te-code |
|00005270| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005280| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005290| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 76 |er-local| ediff-v|
|000052a0| 69 73 69 62 6c 65 2d 62 | 6f 75 6e 64 73 20 70 75 |isible-b|ounds pu|
|000052b0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000052c0| 6c 20 74 5d 20 34 29 0a | 23 40 37 35 20 4e 6f 6e |l t] 4).|#@75 Non|
|000052d0| 2d 6e 69 6c 20 6d 65 61 | 6e 73 20 73 74 61 72 74 |-nil mea|ns start|
|000052e0| 20 6e 61 72 72 6f 77 65 | 64 2c 20 69 66 20 64 6f | narrowe|d, if do|
|000052f0| 69 6e 67 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |ing edif|f-window|
|00005300| 73 2d 2a 20 6f 72 20 65 | 64 69 66 66 2d 72 65 67 |s-* or e|diff-reg|
|00005310| 69 6f 6e 73 2d 2a 1f 0a | 28 64 65 66 76 61 72 20 |ions-*..|(defvar |
|00005320| 65 64 69 66 66 2d 73 74 | 61 72 74 2d 6e 61 72 72 |ediff-st|art-narr|
|00005330| 6f 77 65 64 20 74 20 28 | 23 24 20 2e 20 32 31 31 |owed t (|#$ . 211|
|00005340| 39 37 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |97)).(by|te-code |
|00005350| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005360| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005370| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 73 |er-local| ediff-s|
|00005380| 74 61 72 74 2d 6e 61 72 | 72 6f 77 65 64 20 70 75 |tart-nar|rowed pu|
|00005390| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000053a0| 6c 20 74 5d 20 34 29 0a | 23 40 31 33 32 20 2a 4e |l t] 4).|#@132 *N|
|000053b0| 6f 6e 2d 6e 69 6c 20 6d | 65 61 6e 73 3a 20 77 68 |on-nil m|eans: wh|
|000053c0| 65 6e 20 66 69 6e 69 73 | 68 65 64 2c 20 45 64 69 |en finis|hed, Edi|
|000053d0| 66 66 20 77 69 64 65 6e | 73 20 62 75 66 66 65 72 |ff widen|s buffer|
|000053e0| 73 20 41 2f 42 2e 0a 41 | 63 74 75 61 6c 6c 79 2c |s A/B..A|ctually,|
|000053f0| 20 45 64 69 66 66 20 72 | 65 73 74 6f 72 65 73 20 | Ediff r|estores |
|00005400| 74 68 65 20 73 63 6f 70 | 65 20 6f 66 20 76 69 73 |the scop|e of vis|
|00005410| 69 62 69 6c 69 74 79 20 | 74 68 61 74 20 65 78 69 |ibility |that exi|
|00005420| 73 74 65 64 20 61 74 20 | 73 74 61 72 74 75 70 2e |sted at |startup.|
|00005430| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00005440| 71 75 69 74 2d 77 69 64 | 65 6e 65 64 20 74 20 28 |quit-wid|ened t (|
|00005450| 23 24 20 2e 20 2d 32 31 | 34 32 32 29 29 0a 28 62 |#$ . -21|422)).(b|
|00005460| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00005470| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00005480| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00005490| 6c 20 65 64 69 66 66 2d | 71 75 69 74 2d 77 69 64 |l ediff-|quit-wid|
|000054a0| 65 6e 65 64 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |ened put| permane|
|000054b0| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 28 |nt-local| t] 4).(|
|000054c0| 63 75 73 74 6f 6d 2d 64 | 65 63 6c 61 72 65 2d 76 |custom-d|eclare-v|
|000054d0| 61 72 69 61 62 6c 65 20 | 27 65 64 69 66 66 2d 6b |ariable |'ediff-k|
|000054e0| 65 65 70 2d 76 61 72 69 | 61 6e 74 73 20 27 74 20 |eep-vari|ants 't |
|000054f0| 22 2a 4e 69 6c 20 6d 65 | 61 6e 73 20 74 68 61 74 |"*Nil me|ans that|
|00005500| 20 6e 6f 6e 2d 6d 6f 64 | 69 66 69 65 64 20 76 61 | non-mod|ified va|
|00005510| 72 69 61 6e 74 20 62 75 | 66 66 65 72 73 20 73 68 |riant bu|ffers sh|
|00005520| 6f 75 6c 64 20 62 65 20 | 72 65 6d 6f 76 65 64 20 |ould be |removed |
|00005530| 61 74 20 74 68 65 20 65 | 6e 64 20 6f 66 20 74 68 |at the e|nd of th|
|00005540| 65 20 73 65 73 73 69 6f | 6e 20 61 66 74 65 72 20 |e sessio|n after |
|00005550| 73 6f 6d 65 20 69 6e 74 | 65 72 72 6f 67 61 74 69 |some int|errogati|
|00005560| 6f 6e 2e 5c 6e 53 75 70 | 70 6c 79 69 6e 67 20 61 |on.\nSup|plying a|
|00005570| 20 70 72 65 66 69 78 20 | 61 72 67 75 6d 65 6e 74 | prefix |argument|
|00005580| 20 74 6f 20 74 68 65 20 | 71 75 69 74 20 63 6f 6d | to the |quit com|
|00005590| 6d 61 6e 64 20 60 71 27 | 20 74 65 6d 70 6f 72 61 |mand `q'| tempora|
|000055a0| 72 69 6c 79 20 72 65 76 | 65 72 73 65 73 20 74 68 |rily rev|erses th|
|000055b0| 65 5c 6e 6d 65 61 6e 69 | 6e 67 20 6f 66 20 74 68 |e\nmeani|ng of th|
|000055c0| 69 73 20 76 61 72 69 61 | 62 6c 65 2e 22 20 3a 74 |is varia|ble." :t|
|000055d0| 79 70 65 20 27 62 6f 6f | 6c 65 61 6e 20 3a 67 72 |ype 'boo|lean :gr|
|000055e0| 6f 75 70 20 27 65 64 69 | 66 66 29 0a 23 40 31 38 |oup 'edi|ff).#@18|
|000055f0| 30 20 49 66 20 6e 69 6c | 2c 20 6f 6e 6c 79 20 74 |0 If nil|, only t|
|00005600| 68 65 20 73 65 6c 65 63 | 74 65 64 20 64 69 66 66 |he selec|ted diff|
|00005610| 65 72 65 6e 63 65 73 20 | 61 72 65 20 68 69 67 68 |erences |are high|
|00005620| 6c 69 67 68 74 65 64 2e | 0a 54 68 69 73 20 76 61 |lighted.|.This va|
|00005630| 72 69 61 62 6c 65 20 63 | 61 6e 20 62 65 20 73 65 |riable c|an be se|
|00005640| 74 20 65 69 74 68 65 72 | 20 69 6e 20 2e 65 6d 61 |t either| in .ema|
|00005650| 63 73 20 6f 72 20 74 6f | 67 67 6c 65 64 20 69 6e |cs or to|ggled in|
|00005660| 74 65 72 61 63 74 69 76 | 65 6c 79 2c 20 75 73 69 |teractiv|ely, usi|
|00005670| 6e 67 0a 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |ng.ediff|-toggle-|
|00005680| 68 69 6c 69 74 2e 20 55 | 73 65 20 60 73 65 74 71 |hilit. U|se `setq|
|00005690| 2d 64 65 66 61 75 6c 74 | 27 20 74 6f 20 73 65 74 |-default|' to set|
|000056a0| 20 69 74 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 | it...(d|efvar ed|
|000056b0| 69 66 66 2d 68 69 67 68 | 6c 69 67 68 74 2d 61 6c |iff-high|light-al|
|000056c0| 6c 2d 64 69 66 66 73 20 | 74 20 28 23 24 20 2e 20 |l-diffs |t (#$ . |
|000056d0| 32 32 30 30 32 29 29 0a | 28 62 79 74 65 2d 63 6f |22002)).|(byte-co|
|000056e0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000056f0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00005700| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00005710| 66 2d 68 69 67 68 6c 69 | 67 68 74 2d 61 6c 6c 2d |f-highli|ght-all-|
|00005720| 64 69 66 66 73 20 70 75 | 74 20 70 65 72 6d 61 6e |diffs pu|t perman|
|00005730| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00005740| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00005750| 69 66 66 2d 68 69 67 68 | 6c 69 67 68 74 69 6e 67 |iff-high|lighting|
|00005760| 2d 73 74 79 6c 65 20 6e | 69 6c 20 28 23 24 20 2e |-style n|il (#$ .|
|00005770| 20 32 32 33 34 30 29 29 | 0a 28 62 79 74 65 2d 63 | 22340))|.(byte-c|
|00005780| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00005790| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|000057a0| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|000057b0| 66 66 2d 68 69 67 68 6c | 69 67 68 74 69 6e 67 2d |ff-highl|ighting-|
|000057c0| 73 74 79 6c 65 20 70 75 | 74 20 70 65 72 6d 61 6e |style pu|t perman|
|000057d0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|000057e0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|000057f0| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|00005800| 65 72 2d 73 75 66 66 69 | 78 20 6e 69 6c 20 28 23 |er-suffi|x nil (#|
|00005810| 24 20 2e 20 32 32 35 30 | 30 29 29 0a 28 62 79 74 |$ . 2250|0)).(byt|
|00005820| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005830| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00005840| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00005850| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00005860| 66 66 65 72 2d 73 75 66 | 66 69 78 20 70 75 74 20 |ffer-suf|fix put |
|00005870| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00005880| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00005890| 76 61 72 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |var edif|f-contro|
|000058a0| 6c 2d 62 75 66 66 65 72 | 2d 6e 75 6d 62 65 72 20 |l-buffer|-number |
|000058b0| 6e 69 6c 20 28 23 24 20 | 2e 20 32 32 36 36 36 29 |nil (#$ |. 22666)|
|000058c0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000058d0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|000058e0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|000058f0| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 63 6f 6e 74 |local ed|iff-cont|
|00005900| 72 6f 6c 2d 62 75 66 66 | 65 72 2d 6e 75 6d 62 65 |rol-buff|er-numbe|
|00005910| 72 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |r put pe|rmanent-|
|00005920| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|00005930| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00005940| 62 75 66 66 65 72 2d 76 | 61 6c 75 65 73 2d 6f 72 |buffer-v|alues-or|
|00005950| 69 67 2d 41 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |ig-A nil| (#$ . 2|
|00005960| 32 38 33 32 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |2832)).(|byte-cod|
|00005970| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00005980| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00005990| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|000059a0| 2d 62 75 66 66 65 72 2d | 76 61 6c 75 65 73 2d 6f |-buffer-|values-o|
|000059b0| 72 69 67 2d 41 20 70 75 | 74 20 70 65 72 6d 61 6e |rig-A pu|t perman|
|000059c0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|000059d0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|000059e0| 69 66 66 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |iff-buff|er-value|
|000059f0| 73 2d 6f 72 69 67 2d 42 | 20 6e 69 6c 20 28 23 24 |s-orig-B| nil (#$|
|00005a00| 20 2e 20 32 32 39 39 36 | 29 29 0a 28 62 79 74 65 | . 22996|)).(byte|
|00005a10| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00005a20| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00005a30| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00005a40| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 76 61 6c 75 |diff-buf|fer-valu|
|00005a50| 65 73 2d 6f 72 69 67 2d | 42 20 70 75 74 20 70 65 |es-orig-|B put pe|
|00005a60| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00005a70| 20 34 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 | 4).#@2 |..(defva|
|00005a80| 72 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 76 |r ediff-|buffer-v|
|00005a90| 61 6c 75 65 73 2d 6f 72 | 69 67 2d 43 20 6e 69 6c |alues-or|ig-C nil|
|00005aa0| 20 28 23 24 20 2e 20 32 | 33 31 36 30 29 29 0a 28 | (#$ . 2|3160)).(|
|00005ab0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00005ac0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00005ad0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00005ae0| 61 6c 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |al ediff|-buffer-|
|00005af0| 76 61 6c 75 65 73 2d 6f | 72 69 67 2d 43 20 70 75 |values-o|rig-C pu|
|00005b00| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005b10| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00005b20| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 75 66 66 |efvar ed|iff-buff|
|00005b30| 65 72 2d 76 61 6c 75 65 | 73 2d 6f 72 69 67 2d 41 |er-value|s-orig-A|
|00005b40| 6e 63 65 73 74 6f 72 20 | 6e 69 6c 20 28 23 24 20 |ncestor |nil (#$ |
|00005b50| 2e 20 32 33 33 32 34 29 | 29 0a 28 62 79 74 65 2d |. 23324)|).(byte-|
|00005b60| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 88 |code "..|!.....#.|
|00005b70| c5 16 06 c6 0e 07 42 16 | 07 c8 16 09 c9 0e 07 42 |......B.|.......B|
|00005b80| 16 07 c0 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |...." [m|ake-vari|
|00005b90| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00005ba0| 6c 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 76 |l ediff-|buffer-v|
|00005bb0| 61 6c 75 65 73 2d 6f 72 | 69 67 2d 41 6e 63 65 73 |alues-or|ig-Ances|
|00005bc0| 74 6f 72 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |tor put |permanen|
|00005bd0| 74 2d 6c 6f 63 61 6c 20 | 74 20 28 28 41 20 2e 20 |t-local |t ((A . |
|00005be0| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 76 61 6c |ediff-bu|ffer-val|
|00005bf0| 75 65 73 2d 6f 72 69 67 | 2d 41 29 20 28 42 20 2e |ues-orig|-A) (B .|
|00005c00| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 76 61 | ediff-b|uffer-va|
|00005c10| 6c 75 65 73 2d 6f 72 69 | 67 2d 42 29 20 28 43 20 |lues-ori|g-B) (C |
|00005c20| 2e 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 76 |. ediff-|buffer-v|
|00005c30| 61 6c 75 65 73 2d 6f 72 | 69 67 2d 43 29 20 28 41 |alues-or|ig-C) (A|
|00005c40| 6e 63 65 73 74 6f 72 20 | 2e 20 65 64 69 66 66 2d |ncestor |. ediff-|
|00005c50| 62 75 66 66 65 72 2d 76 | 61 6c 75 65 73 2d 6f 72 |buffer-v|alues-or|
|00005c60| 69 67 2d 41 6e 63 65 73 | 74 6f 72 29 29 20 65 64 |ig-Ances|tor)) ed|
|00005c70| 69 66 66 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |iff-buff|er-value|
|00005c80| 73 2d 6f 72 69 67 2d 61 | 6c 69 73 74 20 63 75 72 |s-orig-a|list cur|
|00005c90| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 20 28 |rent-loa|d-list (|
|00005ca0| 6d 6f 64 65 2d 6c 69 6e | 65 2d 66 6f 72 6d 61 74 |mode-lin|e-format|
|00005cb0| 29 20 65 64 69 66 66 2d | 70 72 6f 74 65 63 74 65 |) ediff-|protecte|
|00005cc0| 64 2d 76 61 72 69 61 62 | 6c 65 73 5d 20 34 29 0a |d-variab|les] 4).|
|00005cd0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00005ce0| 69 66 66 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 76 |iff-diff|erence-v|
|00005cf0| 65 63 74 6f 72 2d 41 20 | 6e 69 6c 20 28 23 24 20 |ector-A |nil (#$ |
|00005d00| 2e 20 32 33 37 36 34 29 | 29 0a 28 62 79 74 65 2d |. 23764)|).(byte-|
|00005d10| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00005d20| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00005d30| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00005d40| 69 66 66 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 76 |iff-diff|erence-v|
|00005d50| 65 63 74 6f 72 2d 41 20 | 70 75 74 20 70 65 72 6d |ector-A |put perm|
|00005d60| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00005d70| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00005d80| 65 64 69 66 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |ediff-di|fference|
|00005d90| 2d 76 65 63 74 6f 72 2d | 42 20 6e 69 6c 20 28 23 |-vector-|B nil (#|
|00005da0| 24 20 2e 20 32 33 39 32 | 36 29 29 0a 28 62 79 74 |$ . 2392|6)).(byt|
|00005db0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00005dc0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00005dd0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00005de0| 65 64 69 66 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |ediff-di|fference|
|00005df0| 2d 76 65 63 74 6f 72 2d | 42 20 70 75 74 20 70 65 |-vector-|B put pe|
|00005e00| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00005e10| 20 34 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 | 4).#@2 |..(defva|
|00005e20| 72 20 65 64 69 66 66 2d | 64 69 66 66 65 72 65 6e |r ediff-|differen|
|00005e30| 63 65 2d 76 65 63 74 6f | 72 2d 43 20 6e 69 6c 20 |ce-vecto|r-C nil |
|00005e40| 28 23 24 20 2e 20 32 34 | 30 38 38 29 29 0a 28 62 |(#$ . 24|088)).(b|
|00005e50| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00005e60| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00005e70| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00005e80| 6c 20 65 64 69 66 66 2d | 64 69 66 66 65 72 65 6e |l ediff-|differen|
|00005e90| 63 65 2d 76 65 63 74 6f | 72 2d 43 20 70 75 74 20 |ce-vecto|r-C put |
|00005ea0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00005eb0| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00005ec0| 76 61 72 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |var edif|f-differ|
|00005ed0| 65 6e 63 65 2d 76 65 63 | 74 6f 72 2d 41 6e 63 65 |ence-vec|tor-Ance|
|00005ee0| 73 74 6f 72 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |stor nil| (#$ . 2|
|00005ef0| 34 32 35 30 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |4250)).(|byte-cod|
|00005f00| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 88 c5 16 06 |e "..!..|...#....|
|00005f10| c6 0e 07 42 16 07 c0 87 | 22 20 5b 6d 61 6b 65 2d |...B....|" [make-|
|00005f20| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00005f30| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 64 69 66 66 |local ed|iff-diff|
|00005f40| 65 72 65 6e 63 65 2d 76 | 65 63 74 6f 72 2d 41 6e |erence-v|ector-An|
|00005f50| 63 65 73 74 6f 72 20 70 | 75 74 20 70 65 72 6d 61 |cestor p|ut perma|
|00005f60| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 20 28 28 41 |nent-loc|al t ((A|
|00005f70| 20 2e 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 | . ediff|-differe|
|00005f80| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 41 29 20 28 42 |nce-vect|or-A) (B|
|00005f90| 20 2e 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 | . ediff|-differe|
|00005fa0| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 42 29 20 28 43 |nce-vect|or-B) (C|
|00005fb0| 20 2e 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 | . ediff|-differe|
|00005fc0| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 43 29 20 28 41 |nce-vect|or-C) (A|
|00005fd0| 6e 63 65 73 74 6f 72 20 | 2e 20 65 64 69 66 66 2d |ncestor |. ediff-|
|00005fe0| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00005ff0| 72 2d 41 6e 63 65 73 74 | 6f 72 29 29 20 65 64 69 |r-Ancest|or)) edi|
|00006000| 66 66 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 76 65 |ff-diffe|rence-ve|
|00006010| 63 74 6f 72 2d 61 6c 69 | 73 74 20 63 75 72 72 65 |ctor-ali|st curre|
|00006020| 6e 74 2d 6c 6f 61 64 2d | 6c 69 73 74 5d 20 34 29 |nt-load-|list] 4)|
|00006030| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|00006040| 64 69 66 66 2d 73 74 61 | 74 65 2d 6f 66 2d 6d 65 |diff-sta|te-of-me|
|00006050| 72 67 65 20 6e 69 6c 20 | 28 23 24 20 2e 20 32 34 |rge nil |(#$ . 24|
|00006060| 36 32 39 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |629)).(b|yte-code|
|00006070| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00006080| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00006090| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000060a0| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 70 |state-of|-merge p|
|000060b0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|000060c0| 61 6c 20 74 5d 20 34 29 | 0a 23 40 32 20 1f 0a 28 |al t] 4)|.#@2 ..(|
|000060d0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 63 75 72 |defvar e|diff-cur|
|000060e0| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|000060f0| 2d 31 20 28 23 24 20 2e | 20 32 34 37 38 31 29 29 |-1 (#$ .| 24781))|
|00006100| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00006110| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00006120| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00006130| 6f 63 61 6c 20 65 64 69 | 66 66 2d 63 75 72 72 65 |ocal edi|ff-curre|
|00006140| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 70 75 |nt-diffe|rence pu|
|00006150| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00006160| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|00006170| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6e 75 6d 62 |efvar ed|iff-numb|
|00006180| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00006190| 73 20 6e 69 6c 20 28 23 | 24 20 2e 20 32 34 39 34 |s nil (#|$ . 2494|
|000061a0| 30 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |0)).(byt|e-code "|
|000061b0| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|000061c0| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000061d0| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 6e 75 |r-local |ediff-nu|
|000061e0| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|000061f0| 63 65 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ces put |permanen|
|00006200| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00006210| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00006220| 66 2d 64 69 66 66 2d 62 | 75 66 66 65 72 20 6e 69 |f-diff-b|uffer ni|
|00006230| 6c 20 28 23 24 20 2e 20 | 32 35 31 30 36 29 29 0a |l (#$ . |25106)).|
|00006240| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00006250| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00006260| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00006270| 63 61 6c 20 65 64 69 66 | 66 2d 64 69 66 66 2d 62 |cal edif|f-diff-b|
|00006280| 75 66 66 65 72 20 70 75 | 74 20 70 65 72 6d 61 6e |uffer pu|t perman|
|00006290| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|000062a0| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|000062b0| 69 66 66 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 2d |iff-cust|om-diff-|
|000062c0| 62 75 66 66 65 72 20 6e | 69 6c 20 28 23 24 20 2e |buffer n|il (#$ .|
|000062d0| 20 32 35 32 35 32 29 29 | 0a 28 62 79 74 65 2d 63 | 25252))|.(byte-c|
|000062e0| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|000062f0| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00006300| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|00006310| 66 66 2d 63 75 73 74 6f | 6d 2d 64 69 66 66 2d 62 |ff-custo|m-diff-b|
|00006320| 75 66 66 65 72 20 70 75 | 74 20 70 65 72 6d 61 6e |uffer pu|t perman|
|00006330| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00006340| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00006350| 69 66 66 2d 66 69 6e 65 | 2d 64 69 66 66 2d 62 75 |iff-fine|-diff-bu|
|00006360| 66 66 65 72 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |ffer nil| (#$ . 2|
|00006370| 35 34 31 32 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |5412)).(|byte-cod|
|00006380| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00006390| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|000063a0| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|000063b0| 2d 66 69 6e 65 2d 64 69 | 66 66 2d 62 75 66 66 65 |-fine-di|ff-buffe|
|000063c0| 72 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |r put pe|rmanent-|
|000063d0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|000063e0| 1f 0a 28 64 65 66 63 6f | 6e 73 74 20 65 64 69 66 |..(defco|nst edif|
|000063f0| 66 2d 74 6d 70 2d 62 75 | 66 66 65 72 20 22 20 2a |f-tmp-bu|ffer " *|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
